Commit a7980ce2 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:r8188eu: refactor rtw_check_beacon_data() - 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 rtw_check_beacon_data().

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6ba87d5

drivers/staging/rtl8188eu/core/rtw_ap.c

+2 −7
Original line number Diff line number Diff line
@@ -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;

		}

		memcpy(&pmlmepriv->htpriv.ht_cap, p+2, ie_len);

	}