staging: rtl8723bs: remove cckrates{only}_included()
PATCH 1/2 staging: rtl8723bs: remove cckrates{only}_included()
In rtw_ieee80211.c there are rtw_is_cckrates_included() and rtw_is_cckratesonly_included() which have the same functionality as cckrates_included() and cckrates_only_included() defined in rtw_wlan_util.c. Remove the functions from rtw_wlan_util.c and use those from rtw_ieee80211.c. Remove the now unused variable ratelen.
Signed-off-by Michael Straube <[email protected]>
--- .../staging/rtl8723bs/core/rtw_wlan_util.c | 34 ++----------------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 2 -- 2 files changed, 3 insertions(+), 33 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -31
@@ -54,32 +54,6 @@ static u8 rtw_basic_rate_ofdm[3] = { IEEE80211_OFDM_RATE_24MB | IEEE80211_BASIC_RATE_MASK }; -int cckrates_included (unsigned char *rate,int ratelen) -{ -int i; - -for (i =0 ; i < ratelen; i++) { -if ((((rate[i]) &0x7f ) ==2 ) || (((rate[i]) &0x7f ) ==4 ) || - (((rate[i]) &0x7f ) ==11 ) || (((rate[i]) &0x7f ) ==22 )) -return true; - } - -return false; -} - -int cckratesonly_included (unsigned char *rate,int ratelen) -{ -int i; - -for (i =0 ; i < ratelen; i++) { -if ((((rate[i]) &0x7f ) !=2 ) && (((rate[i]) &0x7f ) !=4 ) && - (((rate[i]) &0x7f ) !=11 ) && (((rate[i]) &0x7f ) !=22 )) -return false; - } - -return true; -} -u8 networktype_to_raid_ex (struct adapter *adapter,struct sta_info *psta) {u8 raid, cur_rf_type, rf_type =RF_1T1R ;
@@ -1740,15 +1714,13 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap)void update_wireless_mode (struct adapter *padapter) { -int ratelen, network_type =0 ; +int network_type =0 ;u32 SIFS_Timer;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);unsigned char *rate = cur_network->SupportedRates; - ratelen =rtw_get_rateset_len (cur_network->SupportedRates); -if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) pmlmeinfo->HT_enable =1 ;
@@ -1765,9 +1737,9 @@ void update_wireless_mode(struct adapter *padapter)else if (pmlmeinfo->HT_enable) network_type =WIRELESS_11_24N ; -if ((cckratesonly_included (rate, ratelen)) == true) +if (rtw_is_cckratesonly_included (rate)) network_type |=WIRELESS_11B ; -else if ((cckrates_included (rate, ratelen)) == true) +else if (rtw_is_cckrates_included (rate)) network_type |=WIRELESS_11BG ;else network_type |=WIRELESS_11G ;
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +0 -2
@@ -716,8 +716,6 @@ void sa_query_timer_hdl(struct timer_list *t);DBG_871X ("%s set_sa_query_timer(%p, %d)\n" , __func__, (mlmeext), (ms)); \_set_timer (&(mlmeext)->sa_query_timer, (ms)); \ }while (0 ) -extern int cckrates_included(unsigned char *rate, int ratelen); -extern int cckratesonly_included (unsigned char *rate,int ratelen); extern void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr);
Signature · 1 line
2.28.0
PATCH 2/2 staging: rtl8723bs: remove 5 GHz code
Acoording to the TODO code valid only for 5 GHz should be removed.
- 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.
Remove code path only valid for channels > 14.
Signed-off-by Michael Straube <[email protected]>
--- .../staging/rtl8723bs/core/rtw_wlan_util.c | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +11 -20
@@ -1724,26 +1724,17 @@ 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->VHT_enable) - network_type =WIRELESS_11AC ; -else if (pmlmeinfo->HT_enable) - network_type =WIRELESS_11_5N ; - - network_type |=WIRELESS_11A ; - }else { -if (pmlmeinfo->VHT_enable) - network_type =WIRELESS_11AC ; -else if (pmlmeinfo->HT_enable) - network_type =WIRELESS_11_24N ; - -if (rtw_is_cckratesonly_included (rate)) - network_type |=WIRELESS_11B ; -else if (rtw_is_cckrates_included (rate)) - network_type |=WIRELESS_11BG ; -else - network_type |=WIRELESS_11G ; - } +if (pmlmeinfo->VHT_enable) + network_type =WIRELESS_11AC ; +else if (pmlmeinfo->HT_enable) + network_type =WIRELESS_11_24N ; + +if (rtw_is_cckratesonly_included (rate)) + network_type |=WIRELESS_11B ; +else if (rtw_is_cckrates_included (rate)) + network_type |=WIRELESS_11BG ; +else + network_type |=WIRELESS_11G ; pmlmeext->cur_wireless_mode = network_type & padapter->registrypriv.wireless_mode;
Signature · 1 line
2.28.0