shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-01 00:36:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen
2014-04-09 23:21:08 +02:00
committed by Greg Kroah-Hartman
parent 41ed2cb92e
commit f4f1cb92ae
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8723au/include/xmit_osdep.h
View File

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

9
drivers/staging/rtl8723au/os_dep/xmit_linux.c
View File

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