From: Eric Dumazet Date: Tue, 20 May 2014 04:56:34 +0000 (-0700) Subject: ipv6: gro: fix CHECKSUM_COMPLETE support X-Git-Tag: omap-for-v3.16/fixes-against-rc1~146^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4de462ab63e23953fd05da511aeb460ae10cc726;p=pandora-kernel.git 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: bf5a755f5e918 ("net-gre-gro: Add GRE support to the GRO stack") Signed-off-by: Eric Dumazet Cc: Jerry Chu Signed-off-by: David S. Miller --- Reading git-diff-tree failed