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

staging: r8188eu: remove HW_VAR_RESP_SIFS from SetHwReg8188EU() 



SetHwReg8188EU() is called with HW_VAR_RESP_SIFS only in one place.
Remove the HW_VAR_RESP_SIFS case from SetHwReg8188EU() and call
rtw_write8() directly instead. 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/20220329202141.7028-2-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_wlan_util.c

+6 −5
Original line number Diff line number Diff line
@@ -1326,7 +1326,6 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap) 
void update_wireless_mode(struct adapter *padapter)

{

	int ratelen, network_type = 0;

	u32 SIFS_Timer;

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;

	struct wlan_bssid_ex	*cur_network = &pmlmeinfo->network;
@@ -1353,10 +1352,12 @@ void update_wireless_mode(struct adapter *padapter) 


	pmlmeext->cur_wireless_mode = network_type & padapter->registrypriv.wireless_mode;



	SIFS_Timer = 0x0a0a0808;/* 0x0808 -> for CCK, 0x0a0a -> for OFDM */

				/* change this value if having IOT issues. */



	SetHwReg8188EU(padapter, HW_VAR_RESP_SIFS, (u8 *)&SIFS_Timer);

	/* RESP_SIFS for CCK */

	rtw_write8(padapter, REG_R2T_SIFS, 0x08);

	rtw_write8(padapter, REG_R2T_SIFS + 1, 0x08);

	/* RESP_SIFS for OFDM */

	rtw_write8(padapter, REG_T2T_SIFS, 0x0a);

	rtw_write8(padapter, REG_T2T_SIFS + 1, 0x0a);



	if (pmlmeext->cur_wireless_mode & WIRELESS_11B)

		update_mgnt_tx_rate(padapter, IEEE80211_CCK_RATE_1MB);

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −8
Original line number Diff line number Diff line
@@ -1119,14 +1119,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) 
			}

		}

		break;

	case HW_VAR_RESP_SIFS:

		/* RESP_SIFS for CCK */

		rtw_write8(Adapter, REG_R2T_SIFS, val[0]); /*  SIFS_T2T_CCK (0x08) */

		rtw_write8(Adapter, REG_R2T_SIFS + 1, val[1]); /* SIFS_R2T_CCK(0x08) */

		/* RESP_SIFS for OFDM */

		rtw_write8(Adapter, REG_T2T_SIFS, val[2]); /* SIFS_T2T_OFDM (0x0a) */

		rtw_write8(Adapter, REG_T2T_SIFS + 1, val[3]); /* SIFS_R2T_OFDM(0x0a) */

		break;

	case HW_VAR_ACK_PREAMBLE:

		{

			u8 regTmp;

drivers/staging/r8188eu/include/hal_intf.h

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

	HW_VAR_MLME_JOIN,

	HW_VAR_SLOT_TIME,

	HW_VAR_RESP_SIFS,

	HW_VAR_ACK_PREAMBLE,

	HW_VAR_BCN_VALID,

	HW_VAR_DM_FLAG,