Commit 21b1f2b3 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:r8723bs: remove wrappers around skb_clone() and remove unnecessary in_interrupt() call 



Wrappers around skb_clone() do not simplify the driver code.

The skb_clone() is always called from an interrupt handler,
so use GFP_ATOMIC allocation only.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20200531181751.41830-1-insafonov@gmail.com


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

drivers/staging/rtl8723bs/include/osdep_service.h

+0 −3
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ void _kfree(u8 *pbuf, u32 sz); 


struct sk_buff *_rtw_skb_alloc(u32 sz);

struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb);

struct sk_buff *_rtw_skb_clone(struct sk_buff *skb);

int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb);



#define rtw_malloc(sz)			_rtw_malloc((sz))
@@ -103,9 +102,7 @@ int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb); 
#define rtw_skb_alloc(size) _rtw_skb_alloc((size))

#define rtw_skb_alloc_f(size, mstat_f)	_rtw_skb_alloc((size))

#define rtw_skb_copy(skb)	_rtw_skb_copy((skb))

#define rtw_skb_clone(skb)	_rtw_skb_clone((skb))

#define rtw_skb_copy_f(skb, mstat_f)	_rtw_skb_copy((skb))

#define rtw_skb_clone_f(skb, mstat_f)	_rtw_skb_clone((skb))

#define rtw_netif_rx(ndev, skb) _rtw_netif_rx(ndev, skb)



extern void _rtw_init_queue(struct __queue	*pqueue);

drivers/staging/rtl8723bs/os_dep/osdep_service.c

+0 −5
Original line number Diff line number Diff line
@@ -47,11 +47,6 @@ inline struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb) 
	return skb_copy(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);

}



inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb)

{

	return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);

}



inline int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb)

{

	skb->dev = ndev;

drivers/staging/rtl8723bs/os_dep/recv_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt 
			if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)) {

				if (bmcast) {

					psta = rtw_get_bcmc_stainfo(padapter);

					pskb2 = rtw_skb_clone(pkt);

					pskb2 = skb_clone(pkt, GFP_ATOMIC);

				} else {

					psta = rtw_get_stainfo(pstapriv, pattrib->dst);

				}