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

staging: rtl8723au: Fold rtw_remainder_len23a() into _rtw_open_pktfile23a() 



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

drivers/staging/rtl8723au/include/xmit_osdep.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ int rtw_os_xmit_resource_alloc23a(struct rtw_adapter *padapter, 
			       struct xmit_buf *pxmitbuf, u32 alloc_sz);

void rtw_os_xmit_resource_free23a(struct rtw_adapter *padapter,

			       struct xmit_buf *pxmitbuf);

uint rtw_remainder_len23a(struct pkt_file *pfile);

void _rtw_open_pktfile23a(struct sk_buff *pkt, struct pkt_file *pfile);

uint _rtw_pktfile_read23a(struct pkt_file *pfile, u8 *rmem, uint rlen);

int rtw_endofpktfile23a(struct pkt_file *pfile);

drivers/staging/rtl8723au/os_dep/xmit_linux.c

+2 −7
Original line number Diff line number Diff line
@@ -24,12 +24,6 @@ 
#include <xmit_osdep.h>

#include <osdep_intf.h>



uint rtw_remainder_len23a(struct pkt_file *pfile)

{

	return pfile->buf_len - ((unsigned long)(pfile->cur_addr) -

	       (unsigned long)(pfile->buf_start));

}



void _rtw_open_pktfile23a(struct sk_buff *pktptr, struct pkt_file *pfile)

{

	pfile->pkt = pktptr;
@@ -45,7 +39,8 @@ uint _rtw_pktfile_read23a(struct pkt_file *pfile, u8 *rmem, uint rlen) 
{

	uint	len = 0;



	len =  rtw_remainder_len23a(pfile);

	len =  pfile->buf_len - ((unsigned long)(pfile->cur_addr) -

				 (unsigned long)(pfile->buf_start));

	len = (rlen > len) ? len : rlen;



	if (rmem)