Commit 49e64600 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: move rtw_os_xmit_complete() to rtw_xmit.c 



Move the function rtw_os_xmit_complete() from the os_dep/xmit_linux.c
to core/rtw_xmit.c. The goal is to get rid of os_dep/xmit_linux.c in
follow up patches.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220820181623.12497-15-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_xmit.c

+7 −0
Original line number Diff line number Diff line
@@ -229,6 +229,13 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) 
	return res;

}



void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe)

{

	if (pxframe->pkt)

		rtw_os_pkt_complete(padapter, pxframe->pkt);

	pxframe->pkt = NULL;

}



void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)

{

	int i;

drivers/staging/r8188eu/include/rtw_xmit.h

+2 −0
Original line number Diff line number Diff line
@@ -364,6 +364,8 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe); 
int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms);

void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status);



void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe);



/* include after declaring struct xmit_buf, in order to avoid warning */

#include "xmit_osdep.h"

drivers/staging/r8188eu/include/xmit_osdep.h

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,5 @@ struct xmit_buf; 
int rtw_xmit_entry(struct sk_buff *pkt, struct  net_device *pnetdev);



void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt);

void rtw_os_xmit_complete(struct adapter *padapter,

			  struct xmit_frame *pxframe);



#endif /* __XMIT_OSDEP_H_ */

drivers/staging/r8188eu/os_dep/xmit_linux.c

+0 −7
Original line number Diff line number Diff line
@@ -31,13 +31,6 @@ void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt) 
	dev_kfree_skb_any(pkt);

}



void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe)

{

	if (pxframe->pkt)

		rtw_os_pkt_complete(padapter, pxframe->pkt);

	pxframe->pkt = NULL;

}



static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pkt)

{

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;