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

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

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

drivers/staging/rtl8188eu/core/rtw_mlme.c

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

		for (i = 0; i < 16; i++)

			((u8 *)&pmlmeinfo->HT_caps.mcs)[i] &= MCS_rate_1R[i];

			else

				((u8 *)&pmlmeinfo->HT_caps.mcs)[i] &= MCS_rate_2R[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)) {