From: Tom Herbert <therbert@google.com>
Date: Fri, 22 Aug 2014 20:34:52 +0000 (-0700)
Subject: gre: When GRE csum is present count as encap layer wrt csum
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=48a5fc773190bd5339869003fa65d38559bb8890;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

gre: When GRE csum is present count as encap layer wrt csum

In GRE demux if the GRE checksum pop rcv encapsulation so that any
encapsulated checksums are treated as tunnel checksums.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c
index 0485bf7f8f03..7c1a8ff974dd 100644
--- a/net/ipv4/gre_demux.c
+++ b/net/ipv4/gre_demux.c
@@ -125,6 +125,7 @@ static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
 			*csum_err = true;
 			return -EINVAL;
 		}
+		skb_pop_rcv_encapsulation(skb);
 		options++;
 	}