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

staging: rtl8723au: rtl8723au_xmit.c: Fixup messy return type usage 



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

drivers/staging/rtl8723au/hal/rtl8723au_xmit.c

+15 −11
Original line number Diff line number Diff line
@@ -295,10 +295,11 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag 
	return pull;

}



static s32 rtw_dump_xframe(struct rtw_adapter *padapter, struct xmit_frame *pxmitframe)

static int rtw_dump_xframe(struct rtw_adapter *padapter,

			   struct xmit_frame *pxmitframe)

{

	s32 ret = _SUCCESS;

	s32 inner_ret = _SUCCESS;

	int ret = _SUCCESS;

	int inner_ret = _SUCCESS;

	int t, sz, w_sz, pull = 0;

	u8 *mem_addr;

	u32 ff_hwaddr;
@@ -363,8 +364,9 @@ static s32 rtw_dump_xframe(struct rtw_adapter *padapter, struct xmit_frame *pxmi 
	return ret;

}



s32 rtl8723au_xmitframe_complete(struct rtw_adapter *padapter,

				 struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)

bool rtl8723au_xmitframe_complete(struct rtw_adapter *padapter,

				  struct xmit_priv *pxmitpriv,

				  struct xmit_buf *pxmitbuf)

{

	struct hw_xmit *phwxmits;

	struct xmit_frame *pxmitframe;
@@ -413,9 +415,10 @@ s32 rtl8723au_xmitframe_complete(struct rtw_adapter *padapter, 
	return true;

}



static s32 xmitframe_direct(struct rtw_adapter *padapter, struct xmit_frame *pxmitframe)

static int xmitframe_direct(struct rtw_adapter *padapter,

			    struct xmit_frame *pxmitframe)

{

	s32 res = _SUCCESS;

	int res;



	res = rtw_xmitframe_coalesce23a(padapter, pxmitframe->pkt, pxmitframe);

	if (res == _SUCCESS)
@@ -500,16 +503,17 @@ bool rtl8723au_hal_xmit(struct rtw_adapter *padapter, 
	return false;

}



s32 rtl8723au_mgnt_xmit(struct rtw_adapter *padapter, struct xmit_frame *pmgntframe)

int rtl8723au_mgnt_xmit(struct rtw_adapter *padapter,

			struct xmit_frame *pmgntframe)

{

	return rtw_dump_xframe(padapter, pmgntframe);

}



s32	rtl8723au_hal_xmitframe_enqueue(struct rtw_adapter *padapter,

int rtl8723au_hal_xmitframe_enqueue(struct rtw_adapter *padapter,

				    struct xmit_frame *pxmitframe)

{

	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	s32 err;

	int err;



	err = rtw_xmitframe_enqueue23a(padapter, pxmitframe);

	if (err != _SUCCESS) {

drivers/staging/rtl8723au/include/rtl8723a_xmit.h

+2 −2
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ int rtl8723au_hal_xmitframe_enqueue(struct rtw_adapter *padapter, struct xmit_fr 
s32 rtl8723au_xmit_buf_handler(struct rtw_adapter *padapter);

#define hal_xmit_handler rtl8723au_xmit_buf_handler

bool rtl8723au_hal_xmit(struct rtw_adapter *padapter, struct xmit_frame *pxmitframe);

s32 rtl8723au_mgnt_xmit(struct rtw_adapter *padapter, struct xmit_frame *pmgntframe);

s32 rtl8723au_xmitframe_complete(struct rtw_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf);

int rtl8723au_mgnt_xmit(struct rtw_adapter *padapter, struct xmit_frame *pmgntframe);

bool rtl8723au_xmitframe_complete(struct rtw_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf);





#endif