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

staging: rtl8723au: Disentangle rtl8723a_add_rateatid() from HAL 



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

drivers/staging/rtl8723au/core/rtw_ap.c

+3 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <drv_types.h>

#include <linux/ieee80211.h>

#include <wifi.h>

#include <rtl8723a_cmd.h>



#ifdef CONFIG_8723AU_AP_MODE
@@ -430,7 +431,7 @@ void add_RATid23a(struct rtw_adapter *padapter, struct sta_info *psta, u8 rssi_l 
		/* bitmap[28:31]= Rate Adaptive id */

		/* arg[0:4] = macid */

		/* arg[5] = Short GI */

		rtw_hal_add_ra_tid23a(padapter, tx_ra_bitmap, arg, rssi_level);

		rtl8723a_add_rateatid(padapter, tx_ra_bitmap, arg, rssi_level);



		if (shortGIrate == true)

			init_rate |= BIT(6);
@@ -513,8 +514,7 @@ static void update_bmc_sta(struct rtw_adapter *padapter) 
			/* bitmap[28:31]= Rate Adaptive id */

			/* arg[0:4] = macid */

			/* arg[5] = Short GI */

			rtw_hal_add_ra_tid23a(padapter, tx_ra_bitmap, arg, 0);



			rtl8723a_add_rateatid(padapter, tx_ra_bitmap, arg, 0);

		}



		/* set ra_id, init_rate */

drivers/staging/rtl8723au/hal/hal_intf.c

+0 −6
Original line number Diff line number Diff line
@@ -184,12 +184,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)

{

	if (padapter->HalFunc.Add_RateATid)

		padapter->HalFunc.Add_RateATid(padapter, bitmap, arg, rssi_level);

}



s32	rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter)

{

	if (padapter->HalFunc.interrupt_handler)

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+0 −2
Original line number Diff line number Diff line
@@ -1706,8 +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->Add_RateATid = &rtl8723a_add_rateatid;



	/*  Efuse related function */

	pHalFunc->EfusePowerSwitch = &Hal_EfusePowerSwitch;

	pHalFunc->ReadEFuse = &Hal_ReadEFuse;

drivers/staging/rtl8723au/include/hal_intf.h

+0 −4
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ struct hal_ops { 
	void (*UpdateRAMaskHandler)(struct rtw_adapter *padapter,

				    u32 mac_id, u8 rssi_level);



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

			     u8 arg, u8 rssi_level);



	s32 (*hal_xmit)(struct rtw_adapter *padapter,

			struct xmit_frame *pxmitframe);

	s32 (*mgnt_xmit)(struct rtw_adapter *padapter,
@@ -203,7 +200,6 @@ s32 rtw_hal_init23a_recv_priv(struct rtw_adapter *padapter); 
void	rtw_hal_free_recv_priv23a(struct rtw_adapter *padapter);



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);



s32	rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter);