Commit 81c9d573 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: make _rtw_pktfile_read() static 



The function _rtw_pktfile_read() is only used in rtw_xmit.c.
Make it static.

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-11-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_xmit.c

+22 −0
Original line number Diff line number Diff line
@@ -421,6 +421,28 @@ static void rtw_open_pktfile(struct sk_buff *pktptr, struct pkt_file *pfile) 
	pfile->cur_buffer = pfile->buf_start;

}



static uint rtw_remainder_len(struct pkt_file *pfile)

{

	return pfile->buf_len - ((size_t)(pfile->cur_addr) -

	       (size_t)(pfile->buf_start));

}



static uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen)

{

	uint	len = 0;



	len =  rtw_remainder_len(pfile);

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



	if (rmem)

		skb_copy_bits(pfile->pkt, pfile->buf_len - pfile->pkt_len, rmem, len);



	pfile->cur_addr += len;

	pfile->pkt_len -= len;



	return len;

}



static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)

{

	struct ethhdr etherhdr;

drivers/staging/r8188eu/include/xmit_osdep.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ struct xmit_buf; 


int rtw_xmit_entry(struct sk_buff *pkt, struct  net_device *pnetdev);



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



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

void rtw_os_xmit_complete(struct adapter *padapter,

			  struct xmit_frame *pxframe);

drivers/staging/r8188eu/os_dep/xmit_linux.c

+0 −22
Original line number Diff line number Diff line
@@ -11,28 +11,6 @@ 
#include "../include/osdep_intf.h"

#include "../include/usb_osintf.h"



static uint rtw_remainder_len(struct pkt_file *pfile)

{

	return pfile->buf_len - ((size_t)(pfile->cur_addr) -

	       (size_t)(pfile->buf_start));

}



uint _rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen)

{

	uint	len = 0;



	len =  rtw_remainder_len(pfile);

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



	if (rmem)

		skb_copy_bits(pfile->pkt, pfile->buf_len - pfile->pkt_len, rmem, len);



	pfile->cur_addr += len;

	pfile->pkt_len -= len;



	return len;

}



#define WMM_XMIT_THRESHOLD	(NR_XMITFRAME * 2 / 5)



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