Commit dce610a7 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Make direct calls for HW_VAR_AMPDU_{MIN_SPACE,FACTOR} 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d5cdb9e1

drivers/staging/rtl8723au/core/rtw_ap.c

+2 −3
Original line number Diff line number Diff line
@@ -632,9 +632,8 @@ static void update_hw_ht_param(struct rtw_adapter *padapter) 


	min_MPDU_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c) >> 2;



	rtw_hal_set_hwreg23a(padapter, HW_VAR_AMPDU_MIN_SPACE, (u8 *)(&min_MPDU_spacing));



	rtw_hal_set_hwreg23a(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len));

	rtl8723a_set_ampdu_min_space(padapter, min_MPDU_spacing);

	rtl8723a_set_ampdu_factor(padapter, max_AMPDU_len);



	/*  Config SM Power Save setting */

	pmlmeinfo->SM_PS = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & 0x0C) >> 2;

drivers/staging/rtl8723au/core/rtw_wlan_util.c

+2 −3
Original line number Diff line number Diff line
@@ -849,9 +849,8 @@ void HTOnAssocRsp23a(struct rtw_adapter *padapter) 


	min_MPDU_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c) >> 2;



	rtw_hal_set_hwreg23a(padapter, HW_VAR_AMPDU_MIN_SPACE, (u8 *)(&min_MPDU_spacing));



	rtw_hal_set_hwreg23a(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len));

	rtl8723a_set_ampdu_min_space(padapter, min_MPDU_spacing);

	rtl8723a_set_ampdu_factor(padapter, max_AMPDU_len);

}



void ERP_IE_handler23a(struct rtw_adapter *padapter, struct ndis_802_11_var_ies * pIE)

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+0 −8
Original line number Diff line number Diff line
@@ -3157,14 +3157,6 @@ void SetHwReg8723A(struct rtw_adapter *padapter, u8 variable, u8 *val) 
		rtl8723a_odm_support_ability_clr(padapter, *val32);

		break;



	case HW_VAR_AMPDU_MIN_SPACE:

		rtl8723a_set_ampdu_min_space(padapter, *val);

		break;



	case HW_VAR_AMPDU_FACTOR:

		rtl8723a_set_ampdu_factor(padapter, *val);

		break;



	case HW_VAR_RXDMA_AGG_PG_TH:

		rtl8723a_set_rxdma_agg_pg_th(padapter, *val);

		break;

drivers/staging/rtl8723au/include/hal_intf.h

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ enum HW_VARIABLES { 
	HW_VAR_DM_FUNC_SET,

	HW_VAR_DM_FUNC_CLR,

	HW_VAR_CAM_READ,

	HW_VAR_AMPDU_MIN_SPACE,

	HW_VAR_AMPDU_FACTOR,

	HW_VAR_RXDMA_AGG_PG_TH,

	HW_VAR_SET_RPWM,

	HW_VAR_H2C_FW_PWRMODE,