hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8188eu: Remove code valid only for 5 GHz 

Remove code that is only valid for channels > 14.
This addresses the below TODO item.

- find and remove remaining code valid only for 5 GHz. Most of the obvious
  ones have been removed, but things like channel > 14 still exist.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Straube 2018-09-03 20:24:42 +02:00 committed by Greg Kroah-Hartman
parent 352ff6a4c1
commit 8d42daff47
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/staging/rtl8188eu/core/rtw_wlan_util.c
View File

@ -110,22 +110,16 @@ u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
if (pmlmeext->cur_channel > 14) {
if (pmlmeinfo->HT_enable)
network_type = WIRELESS_11_5N;
if (pmlmeinfo->HT_enable)
network_type = WIRELESS_11_24N;
network_type |= WIRELESS_11A;
} else {
if (pmlmeinfo->HT_enable)
network_type = WIRELESS_11_24N;
if ((cckratesonly_included(rate, ratelen)) == true)
network_type |= WIRELESS_11B;
else if ((cckrates_included(rate, ratelen)) == true)
network_type |= WIRELESS_11BG;
else
network_type |= WIRELESS_11G;
if ((cckratesonly_included(rate, ratelen)) == true)
network_type |= WIRELESS_11B;
else if ((cckrates_included(rate, ratelen)) == true)
network_type |= WIRELESS_11BG;
else
network_type |= WIRELESS_11G;
}
return network_type;
}
@ -1429,22 +1423,15 @@ void update_wireless_mode(struct adapter *padapter)
if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
pmlmeinfo->HT_enable = 1;
if (pmlmeext->cur_channel > 14) {
if (pmlmeinfo->HT_enable)
network_type = WIRELESS_11_5N;
if (pmlmeinfo->HT_enable)
network_type = WIRELESS_11_24N;
network_type |= WIRELESS_11A;
} else {
if (pmlmeinfo->HT_enable)
network_type = WIRELESS_11_24N;
if ((cckratesonly_included(rate, ratelen)) == true)
network_type |= WIRELESS_11B;
else if ((cckrates_included(rate, ratelen)) == true)
network_type |= WIRELESS_11BG;
else
network_type |= WIRELESS_11G;
}
if ((cckratesonly_included(rate, ratelen)) == true)
network_type |= WIRELESS_11B;
else if ((cckrates_included(rate, ratelen)) == true)
network_type |= WIRELESS_11BG;
else
network_type |= WIRELESS_11G;
pmlmeext->cur_wireless_mode = network_type & padapter->registrypriv.wireless_mode;