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

staging: rtl8723au: Disentangle beacon register settings 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 daf1fe80

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+2 −2
Original line number Diff line number Diff line
@@ -4674,7 +4674,7 @@ void start_create_ibss23a(struct rtw_adapter* padapter) 
		/* SelectChannel23a(padapter, pmlmeext->cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE); */

		set_channel_bwmode23a(padapter, pmlmeext->cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);



		beacon_timing_control23a(padapter);

		rtl8723a_SetBeaconRelatedRegisters(padapter);



		/* set msr to WIFI_FW_ADHOC_STATE */

		pmlmeinfo->state = WIFI_FW_ADHOC_STATE;
@@ -4752,7 +4752,7 @@ void start_clnt_join23a(struct rtw_adapter* padapter) 
		/* switch channel */

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



		beacon_timing_control23a(padapter);

		rtl8723a_SetBeaconRelatedRegisters(padapter);



		pmlmeinfo->state = WIFI_FW_ADHOC_STATE;

drivers/staging/rtl8723au/core/rtw_wlan_util.c

+0 −5
Original line number Diff line number Diff line
@@ -1683,11 +1683,6 @@ void process_addba_req23a(struct rtw_adapter *padapter, 
	}

}



void beacon_timing_control23a(struct rtw_adapter *padapter)

{

	rtw_hal_bcn_related_reg_setting23a(padapter);

}



static struct rtw_adapter *pbuddy_padapter;



int rtw_handle_dualmac23a(struct rtw_adapter *adapter, bool init)

drivers/staging/rtl8723au/hal/hal_intf.c

+0 −6
Original line number Diff line number Diff line
@@ -196,9 +196,3 @@ s32 rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter) 
		return padapter->HalFunc.interrupt_handler(padapter);

	return _FAIL;

}
 


void rtw_hal_bcn_related_reg_setting23a(struct rtw_adapter *padapter)

{

	if (padapter->HalFunc.SetBeaconRelatedRegistersHandler)

		padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter);

}

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+1 −4
Original line number Diff line number Diff line
@@ -1522,7 +1522,7 @@ static void _BeaconFunctionEnable(struct rtw_adapter *padapter, u8 Enable, 
	rtw_write8(padapter, REG_RD_CTRL + 1, 0x6F);

}



static void rtl8723a_SetBeaconRelatedRegisters(struct rtw_adapter *padapter)

void rtl8723a_SetBeaconRelatedRegisters(struct rtw_adapter *padapter)

{

	u32 value32;

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -1706,9 +1706,6 @@ s32 c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt) 


void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc)

{

	pHalFunc->SetBeaconRelatedRegistersHandler =

		&rtl8723a_SetBeaconRelatedRegisters;



	pHalFunc->Add_RateATid = &rtl8723a_add_rateatid;



	/*  Efuse related function */

drivers/staging/rtl8723au/include/hal_intf.h

+0 −3
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ struct hal_ops { 


	void (*UpdateRAMaskHandler)(struct rtw_adapter *padapter,

				    u32 mac_id, u8 rssi_level);

	void (*SetBeaconRelatedRegistersHandler)(struct rtw_adapter *padapter);



	void (*Add_RateATid)(struct rtw_adapter *padapter, u32 bitmap,

			     u8 arg, u8 rssi_level);
@@ -207,8 +206,6 @@ void rtw_hal_update_ra_mask23a(struct sta_info *psta, u8 rssi_level); 
void	rtw_hal_add_ra_tid23a(struct rtw_adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level);

void	rtw_hal_clone_data(struct rtw_adapter *dst_padapter, struct rtw_adapter *src_padapter);



void rtw_hal_bcn_related_reg_setting23a(struct rtw_adapter *padapter);



s32	rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter);



void hw_var_set_correct_tsf(struct rtw_adapter *padapter);