Commit 14afedb4 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove HW_VAR_AC_PARAM_BE from SetHwReg8188EU() 



Remove the HW_VAR_AC_PARAM_BE case from SetHwReg8188EU() and move the
functionality to the place where SetHwReg8188EU() is called. This is
part of the ongoing effort to get rid of the unwanted hal layer.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220516054830.8702-1-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 381b6d7b

drivers/staging/r8188eu/core/rtw_wlan_util.c

+3 −1
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ void WMMOnAssocRsp(struct adapter *padapter) 
	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;

	struct xmit_priv		*pxmitpriv = &padapter->xmitpriv;

	struct registry_priv	*pregpriv = &padapter->registrypriv;

	struct hal_data_8188e *haldata = &padapter->haldata;



	if (pmlmeinfo->WMM_enable == 0) {

		padapter->mlmepriv.acm_mask = 0;
@@ -567,7 +568,8 @@ void WMMOnAssocRsp(struct adapter *padapter) 


		switch (ACI) {

		case 0x0:

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

			haldata->AcParam_BE = acParm;

			rtw_write32(padapter, REG_EDCA_BE_PARAM, acParm);

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

			edca[XMIT_BE_QUEUE] = acParm;

			break;

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −4
Original line number Diff line number Diff line
@@ -1075,10 +1075,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) 
	case HW_VAR_DM_FUNC_CLR:

		podmpriv->SupportAbility = 0;

		break;

	case HW_VAR_AC_PARAM_BE:

		haldata->AcParam_BE = ((u32 *)(val))[0];

		rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]);

		break;

	case HW_VAR_AMPDU_FACTOR:

		{

			u8 RegToSet_Normal[4] = {0x41, 0xa8, 0x72, 0xb9};

drivers/staging/r8188eu/include/hal_intf.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ enum hw_variables { 
	HW_VAR_DM_FUNC_OP,

	HW_VAR_DM_FUNC_RESET,

	HW_VAR_DM_FUNC_CLR,

	HW_VAR_AC_PARAM_BE,

	HW_VAR_AMPDU_FACTOR,

	HW_VAR_H2C_MEDIA_STATUS_RPT,

};