staging: r8188eu: remove more rf_type related dead code
cover staging: r8188eu: remove more rf_type related dead code
This small series removes some more rf_type related dead code.
Michael Straube (2):
staging: r8188eu: remove rf_type from add_RATid()
staging: r8188eu: remove rf_type from HT_caps_handler()
drivers/staging/r8188eu/core/rtw_ap.c | 7 +------ drivers/staging/r8188eu/core/rtw_wlan_util.c | 11 ++--------- 2 files changed, 3 insertions(+), 15 deletions(-)
Signature · 1 line
2.33.1
PATCH 1/2 staging: r8188eu: remove rf_type from add_RATid()
rf_type is always RF_1T1R. Remove it from add_RATid() and remove related dead code.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_ap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/staging/r8188eu/core/rtw_ap.c +1 -6
@@ -318,7 +318,6 @@ void expire_timeout_chk(struct adapter *padapter)void add_RATid (struct adapter *padapter,struct sta_info *psta,u8 rssi_level) {int i; -u8 rf_type;u32 init_rate =0 ;unsigned char sta_band =0 , raid, shortGIrate = false;unsigned char limit;
@@ -342,11 +341,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) }/* n mode ra_bitmap */ if (psta_ht->ht_option) { -GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); -if (rf_type ==RF_2T2R ) - limit =16 ;/* 2R */ -else - limit =8 ;/* 1R */ + limit =8 ;/* 1R */ for (i =0 ; i < limit; i++) {if (psta_ht->ht_cap.mcs.rx_mask[i /8 ] &BIT (i %8 ))
Signature · 1 line
2.33.1
PATCH 2/2 staging: r8188eu: remove rf_type from HT_caps_handler()
In reply to Michael Strauberf_type is always RF_1T1R. Remove it from HT_caps_handler() and remove related dead code.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_wlan_util.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/staging/r8188eu/core/rtw_wlan_util.c +2 -9
@@ -695,7 +695,6 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_802_11_varvoid HT_caps_handler (struct adapter *padapter,struct ndis_802_11_var_ie *pIE) {unsigned int i; -u8 rf_type;u8 max_AMPDU_len, min_MPDU_spacing;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -730,15 +729,9 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE) } } -GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); -/* update the MCS rates */ -for (i =0 ; i <16 ; i++) { -if ((rf_type ==RF_1T1R ) || (rf_type ==RF_1T2R )) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -else - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - } +for (i =0 ; i <16 ; i++) + pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; }void HT_info_handler (struct adapter *padapter,struct ndis_802_11_var_ie *pIE)
Signature · 1 line
2.33.1