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

staging: rtl8723au: Disentangle set_odm_var() from the HAL wrappers 



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

drivers/staging/rtl8723au/core/rtw_ap.c

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/ieee80211.h>

#include <wifi.h>

#include <rtl8723a_cmd.h>

#include <rtl8723a_hal.h>



#ifdef CONFIG_8723AU_AP_MODE
@@ -497,7 +498,7 @@ static void update_bmc_sta(struct rtw_adapter *padapter) 
		init_rate = get_highest_rate_idx23a(tx_ra_bitmap&0x0fffffff)&0x3f;



		/* ap mode */

		rtw_hal_set_odm_var23a(padapter, HAL_ODM_STA_INFO, psta, true);

		rtl8723a_SetHalODMVar(padapter, HAL_ODM_STA_INFO, psta, true);



		{

			u8 arg = 0;
@@ -552,7 +553,7 @@ void update_sta_info23a_apmode23a(struct rtw_adapter *padapter, struct sta_info 
	DBG_8723A("%s\n", __func__);



	/* ap mode */

	rtw_hal_set_odm_var23a(padapter, HAL_ODM_STA_INFO, psta, true);

	rtl8723a_SetHalODMVar(padapter, HAL_ODM_STA_INFO, psta, true);



	if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)

		psta->ieee8021x_blocked = true;

drivers/staging/rtl8723au/core/rtw_mlme.c

+3 −3
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ rtw_joinbss_update_stainfo(struct rtw_adapter *padapter, 
		psta->mac_id = 0;



		/* sta mode */

		rtw_hal_set_odm_var23a(padapter, HAL_ODM_STA_INFO, psta, true);

		rtl8723a_SetHalODMVar(padapter, HAL_ODM_STA_INFO, psta, true);



		/* security related */

		if (padapter->securitypriv.dot11AuthAlgrthm ==
@@ -1394,7 +1394,7 @@ void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) 
	/* psta->aid = (uint)pstassoc->cam_id; */

	DBG_8723A("%s\n",__func__);

	/* for ad-hoc mode */

	rtw_hal_set_odm_var23a(adapter, HAL_ODM_STA_INFO, psta, true);

	rtl8723a_SetHalODMVar(adapter, HAL_ODM_STA_INFO, psta, true);



	if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)

		psta->dot118021XPrivacy =

drivers/staging/rtl8723au/core/rtw_sta_mgt.c

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <xmit_osdep.h>

#include <mlme_osdep.h>

#include <sta_info.h>

#include <rtl8723a_hal.h>



static void _rtw_init_stainfo(struct sta_info *psta)

{
@@ -273,7 +274,7 @@ u32 rtw_free_stainfo23a(struct rtw_adapter *padapter, struct sta_info *psta) 
		spin_unlock_bh(&ppending_recvframe_queue->lock);

	}

	if (!(psta->state & WIFI_AP_STATE))

		rtw_hal_set_odm_var23a(padapter, HAL_ODM_STA_INFO, psta, false);

		rtl8723a_SetHalODMVar(padapter, HAL_ODM_STA_INFO, psta, false);

#ifdef CONFIG_8723AU_AP_MODE

	spin_lock_bh(&pstapriv->auth_list_lock);

	if (!list_empty(&psta->auth_list)) {

drivers/staging/rtl8723au/hal/hal_intf.c

+0 −6
Original line number Diff line number Diff line
@@ -90,12 +90,6 @@ u8 rtw_hal_get_def_var23a(struct rtw_adapter *padapter, enum hal_def_variable eV 
	return _FAIL;

}



void rtw_hal_set_odm_var23a(struct rtw_adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)

{

	if (padapter->HalFunc.SetHalODMVarHandler)

		padapter->HalFunc.SetHalODMVarHandler(padapter, eVariable, pValue1, bSet);

}



void rtw_hal_enable_interrupt23a(struct rtw_adapter *padapter)

{

	if (padapter->HalFunc.enable_interrupt)

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+3 −5
Original line number Diff line number Diff line
@@ -1577,7 +1577,7 @@ void rtl8723a_SetBeaconRelatedRegisters(struct rtw_adapter *padapter) 
	SetBcnCtrlReg23a(padapter, DIS_BCNQ_SUB, 0);

}



static void rtl8723a_SetHalODMVar(struct rtw_adapter *Adapter,

void rtl8723a_SetHalODMVar(struct rtw_adapter *Adapter,

			   enum hal_odm_variable eVariable,

			   void *pValue1, bool bSet)

{
@@ -1703,8 +1703,6 @@ void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->Efuse_PgPacketWrite23a = &Hal_EfusePgPacketWrite;

	pHalFunc->Efuse_WordEnableDataWrite23a = &Hal_EfuseWordEnableDataWrite;

	pHalFunc->Efuse_PgPacketWrite23a_BT = &Hal_EfusePgPacketWrite_BT;



	pHalFunc->SetHalODMVarHandler = &rtl8723a_SetHalODMVar;

}



void rtl8723a_InitAntenna_Selection(struct rtw_adapter *padapter)