Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68534c68 authored by Amerigo Wang's avatar Amerigo Wang Committed by David S. Miller
Browse files

net: fix a wrong assignment in skb_split() 



commit c9af6db4 (net: Fix possible wrong checksum generation)
has a suspicous piece:

	-       skb_shinfo(skb1)->gso_type = skb_shinfo(skb)->gso_type;
	-
	+       skb_shinfo(skb)->tx_flags = skb_shinfo(skb1)->tx_flags & SKBTX_SHARED_FRAG;

skb1 is the new skb, therefore should be on the left side of the assignment.
This patch fixes it.

Cc: Pravin B Shelar <pshelar@nicira.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <amwang@redhat.com>
Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6b53807

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -2326,7 +2326,7 @@ void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len) 
{

	int pos = skb_headlen(skb);



	skb_shinfo(skb)->tx_flags = skb_shinfo(skb1)->tx_flags & SKBTX_SHARED_FRAG;

	skb_shinfo(skb1)->tx_flags = skb_shinfo(skb)->tx_flags & SKBTX_SHARED_FRAG;

	if (len < pos)	/* Split line is inside header. */

		skb_split_inside_header(skb, skb1, len, pos);

	else		/* Second chunk has no header, nothing to copy. */