Commit a6e7f8a4 authored by Shang XiaoJing's avatar Shang XiaoJing Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Use skb_put_data() instead of skb_put/memcpy pair 



Use skb_put_data() instead of skb_put() and memcpy(), which is shorter
and clear. Drop the tmp variable that is not needed any more.

Signed-off-by: default avatarShang XiaoJing <shangxiaojing@huawei.com>
Link: https://lore.kernel.org/r/20220927024050.13556-1-shangxiaojing@huawei.com


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

drivers/staging/r8188eu/core/rtw_recv.c

+1 −3
Original line number Diff line number Diff line
@@ -1411,7 +1411,6 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe) 
	u8	nr_subframes, i;

	unsigned char *pdata;

	struct rx_pkt_attrib *pattrib;

	unsigned char *data_ptr;

	struct sk_buff *sub_skb, *subframes[MAX_SUBFRAME_COUNT];



	struct recv_priv *precvpriv = &padapter->recvpriv;
@@ -1446,8 +1445,7 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe) 
		sub_skb = dev_alloc_skb(nSubframe_Length + 12);

		if (sub_skb) {

			skb_reserve(sub_skb, 12);

			data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length);

			memcpy(data_ptr, pdata, nSubframe_Length);

			skb_put_data(sub_skb, pdata, nSubframe_Length);

		} else {

			sub_skb = skb_clone(prframe->pkt, GFP_ATOMIC);

			if (sub_skb) {