staging: r8188eu: remove rf_type from rtw_mcs_rate()
PATCH 1/1 staging: r8188eu: remove rf_type from rtw_mcs_rate()
rf_type is always RF_1T1R. Remove it from rtw_mcs_rate() and remove related dead code.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_ieee80211.c | 73 +++++--------------- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 13 ++-- drivers/staging/r8188eu/include/ieee80211.h | 3 +- 3 files changed, 23 insertions(+), 66 deletions(-)
drivers/staging/r8188eu/core/rtw_ieee80211.c +18 -55
@@ -1160,63 +1160,26 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) }/* show MCS rate, unit: 100Kbps */ -u16 rtw_mcs_rate (u8 rf_type,u8 bw_40MHz,u8 short_GI_20,u8 short_GI_40,unsigned char *MCS_rate) +u16 rtw_mcs_rate (u8 bw_40MHz,u8 short_GI_20,u8 short_GI_40,unsigned char *MCS_rate) {u16 max_rate =0 ; -if (rf_type ==RF_1T1R ) { -if (MCS_rate[0 ] &BIT (7 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?1500 :1350 ) : ((short_GI_20) ?722 :650 ); -else if (MCS_rate[0 ] &BIT (6 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?1350 :1215 ) : ((short_GI_20) ?650 :585 ); -else if (MCS_rate[0 ] &BIT (5 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?1200 :1080 ) : ((short_GI_20) ?578 :520 ); -else if (MCS_rate[0 ] &BIT (4 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?900 :810 ) : ((short_GI_20) ?433 :390 ); -else if (MCS_rate[0 ] &BIT (3 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?600 :540 ) : ((short_GI_20) ?289 :260 ); -else if (MCS_rate[0 ] &BIT (2 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?450 :405 ) : ((short_GI_20) ?217 :195 ); -else if (MCS_rate[0 ] &BIT (1 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?300 :270 ) : ((short_GI_20) ?144 :130 ); -else if (MCS_rate[0 ] &BIT (0 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?150 :135 ) : ((short_GI_20) ?72 :65 ); - }else { -if (MCS_rate[1 ]) { -if (MCS_rate[1 ] &BIT (7 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?3000 :2700 ) : ((short_GI_20) ?1444 :1300 ); -else if (MCS_rate[1 ] &BIT (6 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?2700 :2430 ) : ((short_GI_20) ?1300 :1170 ); -else if (MCS_rate[1 ] &BIT (5 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?2400 :2160 ) : ((short_GI_20) ?1156 :1040 ); -else if (MCS_rate[1 ] &BIT (4 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?1800 :1620 ) : ((short_GI_20) ?867 :780 ); -else if (MCS_rate[1 ] &BIT (3 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?1200 :1080 ) : ((short_GI_20) ?578 :520 ); -else if (MCS_rate[1 ] &BIT (2 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?900 :810 ) : ((short_GI_20) ?433 :390 ); -else if (MCS_rate[1 ] &BIT (1 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?600 :540 ) : ((short_GI_20) ?289 :260 ); -else if (MCS_rate[1 ] &BIT (0 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?300 :270 ) : ((short_GI_20) ?144 :130 ); - }else { -if (MCS_rate[0 ] &BIT (7 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?1500 :1350 ) : ((short_GI_20) ?722 :650 ); -else if (MCS_rate[0 ] &BIT (6 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?1350 :1215 ) : ((short_GI_20) ?650 :585 ); -else if (MCS_rate[0 ] &BIT (5 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?1200 :1080 ) : ((short_GI_20) ?578 :520 ); -else if (MCS_rate[0 ] &BIT (4 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?900 :810 ) : ((short_GI_20) ?433 :390 ); -else if (MCS_rate[0 ] &BIT (3 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?600 :540 ) : ((short_GI_20) ?289 :260 ); -else if (MCS_rate[0 ] &BIT (2 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?450 :405 ) : ((short_GI_20) ?217 :195 ); -else if (MCS_rate[0 ] &BIT (1 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?300 :270 ) : ((short_GI_20) ?144 :130 ); -else if (MCS_rate[0 ] &BIT (0 )) - max_rate = (bw_40MHz) ? ((short_GI_40) ?150 :135 ) : ((short_GI_20) ?72 :65 ); - } - } +if (MCS_rate[0 ] &BIT (7 )) + max_rate = (bw_40MHz) ? ((short_GI_40) ?1500 :1350 ) : ((short_GI_20) ?722 :650 ); +else if (MCS_rate[0 ] &BIT (6 )) + max_rate = (bw_40MHz) ? ((short_GI_40) ?1350 :1215 ) : ((short_GI_20) ?650 :585 ); +else if (MCS_rate[0 ] &BIT (5 )) + max_rate = (bw_40MHz) ? ((short_GI_40) ?1200 :1080 ) : ((short_GI_20) ?578 :520 ); +else if (MCS_rate[0 ] &BIT (4 )) + max_rate = (bw_40MHz) ? ((short_GI_40) ?900 :810 ) : ((short_GI_20) ?433 :390 ); +else if (MCS_rate[0 ] &BIT (3 )) + max_rate = (bw_40MHz) ? ((short_GI_40) ?600 :540 ) : ((short_GI_20) ?289 :260 ); +else if (MCS_rate[0 ] &BIT (2 )) + max_rate = (bw_40MHz) ? ((short_GI_40) ?450 :405 ) : ((short_GI_20) ?217 :195 ); +else if (MCS_rate[0 ] &BIT (1 )) + max_rate = (bw_40MHz) ? ((short_GI_40) ?300 :270 ) : ((short_GI_20) ?144 :130 ); +else if (MCS_rate[0 ] &BIT (0 )) + max_rate = (bw_40MHz) ? ((short_GI_40) ?150 :135 ) : ((short_GI_20) ?72 :65 ); +return max_rate; }
drivers/staging/r8188eu/core/rtw_ioctl_set.c +4 -9
@@ -458,7 +458,6 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;struct ieee80211_ht_cap *pht_capie; -u8 rf_type =0 ;u8 bw_40MHz =0 , short_GI_20 =0 , short_GI_40 =0 ;u16 mcs_rate =0 ;u32 ht_ielen =0 ;
@@ -480,14 +479,10 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) short_GI_20 = (le16_to_cpu (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) &IEEE80211_HT_CAP_SGI_20 ) ?1 :0 ; short_GI_40 = (le16_to_cpu (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) &IEEE80211_HT_CAP_SGI_40 ) ?1 :0 ; -GetHwReg8188EU (adapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); - max_rate =rtw_mcs_rate ( - rf_type, - bw_40MHz & (pregistrypriv->cbw40_enable), - short_GI_20, - short_GI_40, - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate - ); + max_rate =rtw_mcs_rate (bw_40MHz & (pregistrypriv->cbw40_enable), + short_GI_20, + short_GI_40, + pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate); } }else {while ((pcur_bss->SupportedRates[i] !=0 ) && (pcur_bss->SupportedRates[i] !=0xFF )) {
drivers/staging/r8188eu/include/ieee80211.h +1 -2
@@ -1149,7 +1149,6 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork);void rtw_macaddr_cfg (u8 *mac_addr); -u16 rtw_mcs_rate (u8 rf_type,u8 bw_40MHz,u8 short_GI_20,u8 short_GI_40, -unsigned char *MCS_rate); +u16 rtw_mcs_rate (u8 bw_40MHz,u8 short_GI_20,u8 short_GI_40,unsigned char *MCS_rate);#endif /* IEEE80211_H */
Signature · 1 line
2.33.1