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

staging: rtl8723au: Disentangle recv/xmit_priv init/free from HAL wrappers 



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

drivers/staging/rtl8723au/core/rtw_recv.c

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <usb_ops.h>

#include <linux/ieee80211.h>

#include <wifi.h>

#include <rtl8723a_recv.h>



void rtw_signal_stat_timer_hdl23a(unsigned long data);
@@ -72,7 +73,7 @@ int _rtw_init_recv_priv23a(struct recv_priv *precvpriv, 
	precvpriv->free_recvframe_cnt = i;

	precvpriv->rx_pending_cnt = 1;



	res = rtw_hal_init23a_recv_priv(padapter);

	res = rtl8723au_init_recv_priv(padapter);



	setup_timer(&precvpriv->signal_stat_timer, rtw_signal_stat_timer_hdl23a,

		    (unsigned long)padapter);
@@ -98,7 +99,7 @@ void _rtw_free_recv_priv23a (struct recv_priv *precvpriv) 
		kfree(precvframe);

	}



	rtw_hal_free_recv_priv23a(padapter);

	rtl8723au_free_recv_priv(padapter);

}



struct recv_frame *rtw_alloc_recvframe23a(struct rtw_queue *pfree_recv_queue)

drivers/staging/rtl8723au/core/rtw_xmit.c

+3 −1
Original line number Diff line number Diff line
@@ -194,7 +194,9 @@ int _rtw_init_xmit_priv23a(struct xmit_priv *pxmitpriv, 
	pxmitpriv->ack_tx = false;

	mutex_init(&pxmitpriv->ack_tx_mutex);

	rtw_sctx_init23a(&pxmitpriv->ack_tx_ops, 0);

	rtw_hal_init23a_xmit_priv(padapter);

	tasklet_init(&padapter->xmitpriv.xmit_tasklet,

		     (void(*)(unsigned long))rtl8723au_xmit_tasklet,

		     (unsigned long)padapter);



exit:

drivers/staging/rtl8723au/hal/hal_intf.c

+0 −20
Original line number Diff line number Diff line
@@ -95,26 +95,6 @@ s32 rtw_hal_mgnt_xmit23a(struct rtw_adapter *padapter, struct xmit_frame *pmgntf 
	return ret;

}



s32	rtw_hal_init23a_xmit_priv(struct rtw_adapter *padapter)

{

	if (padapter->HalFunc.init_xmit_priv != NULL)

		return padapter->HalFunc.init_xmit_priv(padapter);

	return _FAIL;

}



s32	rtw_hal_init23a_recv_priv(struct rtw_adapter *padapter)

{

	if (padapter->HalFunc.init_recv_priv)

		return padapter->HalFunc.init_recv_priv(padapter);



	return _FAIL;

}

void	rtw_hal_free_recv_priv23a(struct rtw_adapter *padapter)

{

	if (padapter->HalFunc.free_recv_priv)

		padapter->HalFunc.free_recv_priv(padapter);

}



void rtw_hal_update_ra_mask23a(struct sta_info *psta, u8 rssi_level)

{

	struct rtw_adapter *padapter;

drivers/staging/rtl8723au/hal/rtl8723au_xmit.c

+0 −10
Original line number Diff line number Diff line
@@ -21,16 +21,6 @@ 
/* include <rtl8192c_hal.h> */

#include <rtl8723a_hal.h>



s32	rtl8723au_init_xmit_priv(struct rtw_adapter *padapter)

{

	struct xmit_priv	*pxmitpriv = &padapter->xmitpriv;



	tasklet_init(&pxmitpriv->xmit_tasklet,

	     (void(*)(unsigned long))rtl8723au_xmit_tasklet,

	     (unsigned long)padapter);

	return _SUCCESS;

}



static void do_queue_select(struct rtw_adapter	*padapter, struct pkt_attrib *pattrib)

{

	u8 qsel;

drivers/staging/rtl8723au/hal/usb_halinit.c

+0 −4
Original line number Diff line number Diff line
@@ -1773,10 +1773,6 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter) 
		return -ENOMEM;

	}



	pHalFunc->init_xmit_priv = &rtl8723au_init_xmit_priv;



	pHalFunc->init_recv_priv = &rtl8723au_init_recv_priv;

	pHalFunc->free_recv_priv = &rtl8723au_free_recv_priv;

	pHalFunc->InitSwLeds = NULL;

	pHalFunc->DeInitSwLeds = NULL;