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

staging: r8188eu: remove HW_VAR_MLME_DISCONNECT from SetHwReg8188EU() 



SetHwReg8188EU() is called with HW_VAR_MLME_DISCONNECT only from
functions in rtw_mlme_ext.c. Move the functionality into a static
function in rtw_mlme_ext.c and remove the HW_VAR_MLME_DISCONNECT case
from SetHwReg8188EU(). 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-3-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+16 −3
Original line number Diff line number Diff line
@@ -6796,13 +6796,26 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *p 
	update_sta_info(padapter, psta);

}



static void mlme_disconnect(struct adapter *adapter)

{

	/* Set RCR to not to receive data frame when NO LINK state */

	/* reject all data frames */

	rtw_write16(adapter, REG_RXFLTMAP2, 0x00);



	/* reset TSF */

	rtw_write8(adapter, REG_DUAL_TSF_RST, (BIT(0) | BIT(1)));



	/* disable update TSF */

	rtw_write8(adapter, REG_BCN_CTRL, rtw_read8(adapter, REG_BCN_CTRL) | BIT(4));

}



void mlmeext_sta_del_event_callback(struct adapter *padapter)

{

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;



	if (is_client_associated_to_ap(padapter) || is_IBSS_empty(padapter)) {

		SetHwReg8188EU(padapter, HW_VAR_MLME_DISCONNECT, NULL);

		mlme_disconnect(padapter);

		SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr);



		/* restore to initial setting. */
@@ -7166,7 +7179,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) 
		/* set MSR to nolink -> infra. mode */

		Set_MSR(padapter, _HW_STATE_STATION_);



		SetHwReg8188EU(padapter, HW_VAR_MLME_DISCONNECT, NULL);

		mlme_disconnect(padapter);

	}



	rtw_antenna_select_cmd(padapter, pparm->network.PhyInfo.Optimum_antenna, false);
@@ -7262,7 +7275,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf) 
	if (is_client_associated_to_ap(padapter))

		issue_deauth_ex(padapter, pnetwork->MacAddress, WLAN_REASON_DEAUTH_LEAVING, param->deauth_timeout_ms / 100, 100);



	SetHwReg8188EU(padapter, HW_VAR_MLME_DISCONNECT, NULL);

	mlme_disconnect(padapter);

	SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr);



	/* restore to initial setting. */

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −11
Original line number Diff line number Diff line
@@ -1024,17 +1024,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) 
				ResumeTxBeacon(Adapter);

		}

		break;

	case HW_VAR_MLME_DISCONNECT:

		/* Set RCR to not to receive data frame when NO LINK state */

		/* reject all data frames */

		rtw_write16(Adapter, REG_RXFLTMAP2, 0x00);



		/* reset TSF */

		rtw_write8(Adapter, REG_DUAL_TSF_RST, (BIT(0) | BIT(1)));



		/* disable update TSF */

		rtw_write8(Adapter, REG_BCN_CTRL, rtw_read8(Adapter, REG_BCN_CTRL) | BIT(4));

		break;

	case HW_VAR_MLME_SITESURVEY:

		if (*((u8 *)val)) { /* under sitesurvey */

			/* config RCR to receive different BSSID & not to receive data frame */

drivers/staging/r8188eu/include/hal_intf.h

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

	HW_VAR_BASIC_RATE,

	HW_VAR_CORRECT_TSF,

	HW_VAR_MLME_DISCONNECT,

	HW_VAR_MLME_SITESURVEY,

	HW_VAR_MLME_JOIN,

	HW_VAR_SLOT_TIME,