staging:r8188eu: use DIV_ROUND_UP() in rtw_signal_stat_timer_hdl()
PATCH 1/9 staging:r8188eu: use DIV_ROUND_UP() in rtw_signal_stat_timer_hdl()
DIV_ROUND_UP macro is shorter and look better than if-else construction. DIV_ROUND_UP used in rtw_signal_stat_timer_hdl().
--- drivers/staging/rtl8188eu/core/rtw_recv.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +2 -8
@@ -2050,19 +2050,13 @@ static void rtw_signal_stat_timer_hdl(unsigned long data)if (check_fwstate (&adapter->mlmepriv, _FW_UNDER_SURVEY) == false) { tmp_s = avg_signal_strength + (_alpha -1 ) * recvpriv->signal_strength; -if (tmp_s % _alpha) - tmp_s = tmp_s / _alpha +1 ; -else - tmp_s = tmp_s / _alpha; + tmp_s =DIV_ROUND_UP (tmp_s, _alpha);if (tmp_s >100 ) tmp_s =100 ; tmp_q = avg_signal_qual + (_alpha -1 ) * recvpriv->signal_qual; -if (tmp_q % _alpha) - tmp_q = tmp_q / _alpha +1 ; -else - tmp_q = tmp_q / _alpha; + tmp_q =DIV_ROUND_UP (tmp_q, _alpha);if (tmp_q >100 ) tmp_q =100 ;
Signature · 1 line
2.10.2
PATCH 2/9 staging:r8188eu: refactor add_RATid() - remove rtw_hal_get_hwreg() call
rtw_hal_get_hwreg(..., HW_VAR_RF_TYPE,...) always return RF_1T1R value. Replace the function call with RF_1T1R value and refactor add_RATid().
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +2 -11
@@ -448,10 +448,8 @@ 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;unsigned int tx_ra_bitmap =0 ;struct ht_priv *psta_ht =NULL ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -472,16 +470,9 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) }/* n mode ra_bitmap */ if (psta_ht->ht_option) { -rtw_hal_get_hwreg (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); -if (rf_type ==RF_2T2R ) - limit =16 ;/* 2R */ -else - limit =8 ;/* 1R */ - -for (i =0 ; i < limit; i++) { -if (psta_ht->ht_cap.mcs.rx_mask[i /8 ] &BIT (i %8 )) +for (i =0 ; i <8 ; i++) +if (psta_ht->ht_cap.mcs.rx_mask[0 ] &BIT (i)) tx_ra_bitmap |=BIT (i +12 ); - }/* max short GI rate */ shortGIrate = psta_ht->sgi;
Signature · 1 line
2.10.2
PATCH 3/9 staging:r8188eu: refactor rtw_check_beacon_data() - remove rtw_hal_get_hwreg() call
In reply to Ivan Safonovrtw_hal_get_hwreg(..., HW_VAR_RF_TYPE,...) always return RF_1T1R value. Replace the function call with RF_1T1R value
and refactor rtw_check_beacon_data().
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +2 -7
@@ -1024,15 +1024,12 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));if (p && ie_len >0 ) { -u8 rf_type;struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p +2 ); pHT_caps_ie = p; ht_cap = true; network_type |=WIRELESS_11_24N ; -rtw_hal_get_hwreg (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); -if ((psecuritypriv->wpa_pairwise_cipher &WPA_CIPHER_CCMP ) || (psecuritypriv->wpa2_pairwise_cipher &WPA_CIPHER_CCMP )) pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 <<2 ));
@@ -1042,10 +1039,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* set Max Rx AMPDU size to 64K */ pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR &0x03 ); -if (rf_type ==RF_1T1R ) { - pht_cap->mcs.rx_mask[0 ] =0xff ; - pht_cap->mcs.rx_mask[1 ] =0x0 ; - } + pht_cap->mcs.rx_mask[0 ] =0xff ; + pht_cap->mcs.rx_mask[1 ] =0x0 ;memcpy (&pmlmepriv->htpriv.ht_cap, p+2 , ie_len); }
Signature · 1 line
2.10.2
PATCH 4/9 staging:r8188eu: refactor rtw_get_cur_max_rate() - remove rtw_hal_get_hwreg() call
In reply to Ivan Safonovrtw_hal_get_hwreg(..., HW_VAR_RF_TYPE,...) always return RF_1T1R value. Replace the function call with RF_1T1R value
and refactor rtw_get_cur_max_rate().
--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +1 -3
@@ -569,7 +569,6 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)struct registry_priv *pregistrypriv = &adapter->registrypriv;struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; -u8 rf_type =0 ;u8 bw_40MHz =0 , short_GI_20 =0 , short_GI_40 =0 ;u32 ht_ielen =0 ;
@@ -586,9 +585,8 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) short_GI_20 = (le16_to_cpu (pmlmeinfo->HT_caps.cap_info) &IEEE80211_HT_CAP_SGI_20 ) ?1 :0 ; short_GI_40 = (le16_to_cpu (pmlmeinfo->HT_caps.cap_info) &IEEE80211_HT_CAP_SGI_40 ) ?1 :0 ; -rtw_hal_get_hwreg (adapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); max_rate = rtw_mcs_rate( - rf_type, + RF_1T1R, bw_40MHz & (pregistrypriv->cbw40_enable), short_GI_20, short_GI_40,
Signature · 1 line
2.10.2
PATCH 5/9 staging:r8188eu: refactor issue_assocreq() - remove rtw_hal_get_hwreg() call
In reply to Ivan Safonovrtw_hal_get_hwreg(..., HW_VAR_RF_TYPE,...) always return RF_1T1R value. Replace the function call with RF_1T1R value and refactor issue_assocreq().
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +4 -20
@@ -1027,7 +1027,7 @@ static void issue_assocreq(struct adapter *padapter)struct ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned int i, j, ie_len, index =0 ; -unsigned char rf_type, bssrate[NumRates], sta_bssrate[NumRates]; +unsigned char bssrate[NumRates], sta_bssrate[NumRates];struct ndis_802_11_var_ie *pIE;struct registry_priv *pregpriv = &padapter->registrypriv;struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
@@ -1150,25 +1150,9 @@ static void issue_assocreq(struct adapter *padapter)/* todo: disable SM power save mode */ pmlmeinfo->HT_caps.cap_info |=cpu_to_le16 (0x000c ); -rtw_hal_get_hwreg (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); -switch (rf_type) { -case RF_1T1R : -if (pregpriv->rx_stbc) - pmlmeinfo->HT_caps.cap_info |=cpu_to_le16 (0x0100 );/* RX STBC One spatial stream */ -memcpy ((u8 *)&pmlmeinfo->HT_caps.mcs, MCS_rate_1R,16 ); -break ; -case RF_2T2R : -case RF_1T2R : -default : -if ((pregpriv->rx_stbc ==0x3 ) ||/* enable for 2.4/5 GHz */ - ((pmlmeext->cur_wireless_mode &WIRELESS_11_24N ) && (pregpriv->rx_stbc ==0x1 )) ||/* enable for 2.4GHz */ - (pregpriv->wifi_spec ==1 )) { -DBG_88E ("declare supporting RX STBC\n" ); - pmlmeinfo->HT_caps.cap_info |=cpu_to_le16 (0x0200 );/* RX STBC two spatial stream */ - } -memcpy (&pmlmeinfo->HT_caps.mcs, MCS_rate_2R,16 ); -break ; - } +if (pregpriv->rx_stbc) + pmlmeinfo->HT_caps.cap_info |=cpu_to_le16 (0x0100 );/* RX STBC One spatial stream */ +memcpy ((u8 *)&pmlmeinfo->HT_caps.mcs, MCS_rate_1R,16 ); pframe =rtw_set_ie (pframe, _HT_CAPABILITY_IE_, ie_len, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen)); } }
Signature · 1 line
2.10.2
PATCH 6/9 staging:r8188eu: refactor rtw_update_ht_cap() - remove rtw_hal_get_hwreg() call
In reply to Ivan Safonovrtw_hal_get_hwreg(..., HW_VAR_RF_TYPE,...) always return RF_1T1R value. Replace the function call with RF_1T1R value and refactor rtw_update_ht_cap().
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +2 -9
@@ -2018,17 +2018,10 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len) (le16_to_cpu(pmlmeinfo->HT_caps.cap_info) & BIT(1)) && (pmlmeinfo->HT_info.infos[0] & BIT(2))) {int i; -u8 rf_type; - -rtw_hal_get_hwreg (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 )) - ((u8 *)&pmlmeinfo->HT_caps.mcs)[i] &= MCS_rate_1R[i]; -else - ((u8 *)&pmlmeinfo->HT_caps.mcs)[i] &= MCS_rate_2R[i]; - } +for (i =0 ; i <16 ; i++) + ((u8 *)&pmlmeinfo->HT_caps.mcs)[i] &= MCS_rate_1R[i];/* switch to the 40M Hz mode according to the AP */ pmlmeext->cur_bwmode =HT_CHANNEL_WIDTH_40 ;switch ((pmlmeinfo->HT_info.infos[0 ] &0x3 )) {
Signature · 1 line
2.10.2
PATCH 7/9 staging:r8188eu: refactor HT_caps_handler() - remove rtw_hal_get_hwreg() call
In reply to Ivan Safonovrtw_hal_get_hwreg(..., HW_VAR_RF_TYPE,...) always return RF_1T1R value. Replace the function call with RF_1T1R value and refactor HT_caps_handler().
--- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +2 -9
@@ -708,7 +708,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);
@@ -744,15 +743,9 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE) } } -rtw_hal_get_hwreg (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 )) - ((u8 *)&pmlmeinfo->HT_caps.mcs)[i] &= MCS_rate_1R[i]; -else - ((u8 *)&pmlmeinfo->HT_caps.mcs)[i] &= MCS_rate_2R[i]; - } +for (i =0 ; i <16 ; i++) + ((u8 *)&pmlmeinfo->HT_caps.mcs)[i] &= MCS_rate_1R[i]; }void HT_info_handler (struct adapter *padapter,struct ndis_802_11_var_ie *pIE)
Signature · 1 line
2.10.2
PATCH 8/9 staging:r8188eu: remove unused HW_VAR_RF_TYPE parameter of HT_caps_handler
In reply to Ivan Safonovrtw_hal_get_hwreg() does not used with HW_VAR_RF_TYPE parameter. Remove HW_VAR_RF_TYPE switch case in rtw_hal_get_hwreg and definition.
--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 3 --- drivers/staging/rtl8188eu/include/hal_intf.h | 1 - 2 files changed, 4 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +0 -3
@@ -1745,9 +1745,6 @@ void rtw_hal_get_hwreg(struct adapter *Adapter, u8 variable, u8 *val)/* BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2 */ val[0 ] = (BIT (0 ) &usb_read8 (Adapter,REG_TDECTRL +2 )) ? true : false;break ; -case HW_VAR_RF_TYPE : - val[0 ] =RF_1T1R ; -break ;case HW_VAR_FWLPS_RF_ON : {/* When we halt NIC, we should check if FW LPS is leave. */
drivers/staging/rtl8188eu/include/hal_intf.h +0 -1
@@ -57,7 +57,6 @@ enum hw_variables {HW_VAR_ACK_PREAMBLE ,HW_VAR_SEC_CFG ,HW_VAR_BCN_VALID , -HW_VAR_RF_TYPE ,HW_VAR_DM_FUNC_OP ,HW_VAR_DM_FUNC_SET , HW_VAR_DM_FUNC_CLR,
Signature · 1 line
2.10.2
PATCH 9/9 staging:r8188eu: remove unused MCS_rate_2R array
In reply to Ivan SafonovMCS_rate_2R[] does not used. Remove it.
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 1 - drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 1 - drivers/staging/rtl8188eu/include/rtw_mlme.h | 1 - 3 files changed, 3 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +0 -1
@@ -28,7 +28,6 @@#include <rtw_ioctl_set.h> #include <linux/vmalloc.h> -extern unsigned char MCS_rate_2R[16 ];extern unsigned char MCS_rate_1R[16 ];int rtw_init_mlme_priv (struct adapter *padapter)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +0 -1
@@ -47,7 +47,6 @@ extern unsigned char REALTEK_96B_IE[];/******************************************************** MCS rate definitions *********************************************************/ -unsigned char MCS_rate_2R[16 ] = {0xff ,0xff ,0x0 ,0x0 ,0x01 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 };unsigned char MCS_rate_1R[16 ] = {0xff ,0x00 ,0x0 ,0x0 ,0x01 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 ,0x0 };/********************************************************
drivers/staging/rtl8188eu/include/rtw_mlme.h +0 -1
@@ -216,7 +216,6 @@ void hostapd_mode_unload(struct adapter *padapter);extern unsigned char WPA_TKIP_CIPHER [4 ];extern unsigned char RSN_TKIP_CIPHER [4 ];extern unsigned char REALTEK_96B_IE []; -extern unsigned char MCS_rate_2R[16 ];extern unsigned char MCS_rate_1R[16 ];void rtw_joinbss_event_prehandle (struct adapter *adapter,u8 *pbuf);
Signature · 1 line
2.10.2