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

staging: rtl8723au: Eiminate the use of HW_VAR_AC_PARAM_{VO,VI,BE,BK} 



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

drivers/staging/rtl8723au/core/rtw_ap.c

+4 −4
Original line number Diff line number Diff line
@@ -699,13 +699,13 @@ static void start_bss_network(struct rtw_adapter *padapter, u8 *pbuf) 


	/* Set EDCA param reg */

	acparm = 0x002F3217; /*  VO */

	rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acparm));

	rtl8723a_set_ac_param_vo(padapter, acparm);

	acparm = 0x005E4317; /*  VI */

	rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acparm));

	rtl8723a_set_ac_param_vi(padapter, acparm);

	acparm = 0x005ea42b;

	rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acparm));

	rtl8723a_set_ac_param_be(padapter, acparm);

	acparm = 0x0000A444; /*  BK */

	rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acparm));

	rtl8723a_set_ac_param_bk(padapter, acparm);



	/* Set Security */

	val8 = (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) ?

drivers/staging/rtl8723au/core/rtw_wlan_util.c

+4 −4
Original line number Diff line number Diff line
@@ -602,22 +602,22 @@ void WMMOnAssocRsp23a(struct rtw_adapter *padapter) 


		switch (ACI) {

		case 0x0:

			rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acParm));

			rtl8723a_set_ac_param_be(padapter, acParm);

			acm_mask |= (ACM? BIT(1):0);

			edca[XMIT_BE_QUEUE] = acParm;

			break;

		case 0x1:

			rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acParm));

			rtl8723a_set_ac_param_bk(padapter, acParm);

			/* acm_mask |= (ACM? BIT(0):0); */

			edca[XMIT_BK_QUEUE] = acParm;

			break;

		case 0x2:

			rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acParm));

			rtl8723a_set_ac_param_vi(padapter, acParm);

			acm_mask |= (ACM? BIT(2):0);

			edca[XMIT_VI_QUEUE] = acParm;

			break;

		case 0x3:

			rtw_hal_set_hwreg23a(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acParm));

			rtl8723a_set_ac_param_vo(padapter, acParm);

			acm_mask |= (ACM? BIT(3):0);

			edca[XMIT_VO_QUEUE] = acParm;

			break;

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

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

		break;



	case HW_VAR_AC_PARAM_VO:

		rtl8723a_set_ac_param_vo(padapter, *val32);

		break;



	case HW_VAR_AC_PARAM_VI:

		rtl8723a_set_ac_param_vi(padapter, *val32);

		break;



	case HW_VAR_AC_PARAM_BE:

		rtl8723a_set_ac_param_be(padapter, *val32);

		break;



	case HW_VAR_AC_PARAM_BK:

		rtl8723a_set_ac_param_bk(padapter, *val32);

		break;



	case HW_VAR_ACM_CTRL:

		rtl8723a_set_acm_ctrl(padapter, *val);

		break;

drivers/staging/rtl8723au/include/hal_intf.h

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

	HW_VAR_DM_FUNC_CLR,

	HW_VAR_CAM_READ,

	HW_VAR_AC_PARAM_VO,

	HW_VAR_AC_PARAM_VI,

	HW_VAR_AC_PARAM_BE,

	HW_VAR_AC_PARAM_BK,

	HW_VAR_ACM_CTRL,

	HW_VAR_AMPDU_MIN_SPACE,

	HW_VAR_AMPDU_FACTOR,