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

Commit 4de462ab authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv6: gro: fix CHECKSUM_COMPLETE support 



When GRE support was added in linux-3.14, CHECKSUM_COMPLETE handling
broke on GRE+IPv6 because we did not update/use the appropriate csum :

GRO layer is supposed to use/update NAPI_GRO_CB(skb)->csum instead of
skb->csum

Tested using a GRE tunnel and IPv6 traffic. GRO aggregation now happens
at the first level (ethernet device) instead of being done in gre
tunnel. Native IPv6+TCP is still properly aggregated.

Fixes: bf5a755f ("net-gre-gro: Add GRE support to the GRO stack")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Jerry Chu <hkchu@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf63ac73

net/ipv6/ip6_offload.c

+1 −5
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head, 
	unsigned int off;

	u16 flush = 1;

	int proto;

	__wsum csum;



	off = skb_gro_offset(skb);

	hlen = off + sizeof(*iph);
@@ -264,13 +263,10 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head, 


	NAPI_GRO_CB(skb)->flush |= flush;



	csum = skb->csum;

	skb_postpull_rcsum(skb, iph, skb_network_header_len(skb));

	skb_gro_postpull_rcsum(skb, iph, nlen);



	pp = ops->callbacks.gro_receive(head, skb);



	skb->csum = csum;



out_unlock:

	rcu_read_unlock();

net/ipv6/tcpv6_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static struct sk_buff **tcp6_gro_receive(struct sk_buff **head, 
	if (NAPI_GRO_CB(skb)->flush)

		goto skip_csum;



	wsum = skb->csum;

	wsum = NAPI_GRO_CB(skb)->csum;



	switch (skb->ip_summed) {

	case CHECKSUM_NONE: