Commit 89ba56a6 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove HW_VAR_SEC_CFG 



Remove HW_VAR_SEC_CFG from SetHwReg8188EU() and call rtw_write8()
directly.

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


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+3 −6
Original line number Diff line number Diff line
@@ -6382,7 +6382,6 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st 
void start_create_ibss(struct adapter *padapter)

{

	unsigned short	caps;

	u8 val8;

	u8 join_type;

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;
@@ -6397,8 +6396,7 @@ void start_create_ibss(struct adapter *padapter) 
	caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);

	update_capinfo(padapter, caps);

	if (caps & cap_IBSS) {/* adhoc master */

		val8 = 0xcf;

		SetHwReg8188EU(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));

		rtw_write8(padapter, REG_SECCFG, 0xcf);



		/* switch channel */

		/* SelectChannel(padapter, pmlmeext->cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE); */
@@ -6454,7 +6452,7 @@ void start_clnt_join(struct adapter *padapter) 


		val8 = (pmlmeinfo->auth_algo == dot11AuthAlgrthm_8021X) ? 0xcc : 0xcf;



		SetHwReg8188EU(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));

		rtw_write8(padapter, REG_SECCFG, val8);



		/* switch channel */

		set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);
@@ -6470,8 +6468,7 @@ void start_clnt_join(struct adapter *padapter) 
	} else if (caps & cap_IBSS) { /* adhoc client */

		Set_MSR(padapter, WIFI_FW_ADHOC_STATE);



		val8 = 0xcf;

		SetHwReg8188EU(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));

		rtw_write8(padapter, REG_SECCFG, 0xcf);



		/* switch channel */

		set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −3
Original line number Diff line number Diff line
@@ -1290,9 +1290,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) 
			rtw_write8(Adapter, REG_RRSR + 2, regTmp);

		}

		break;

	case HW_VAR_SEC_CFG:

		rtw_write8(Adapter, REG_SECCFG, *((u8 *)val));

		break;

	case HW_VAR_DM_FLAG:

		podmpriv->SupportAbility = *((u8 *)val);

		break;

drivers/staging/r8188eu/include/hal_intf.h

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

	HW_VAR_RESP_SIFS,

	HW_VAR_ACK_PREAMBLE,

	HW_VAR_SEC_CFG,

	HW_VAR_BCN_VALID,

	HW_VAR_DM_FLAG,

	HW_VAR_DM_FUNC_OP,