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>
mariux64 · Aug 25, 2014 · 48a5fc7 · 48a5fc7
1 parent 57c67ff
commit 48a5fc7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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++;
 	}