gre: When GRE csum is present count as encap layer wrt csum
authorTom Herbert <therbert@google.com>
Fri, 22 Aug 2014 20:34:52 +0000 (13:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Aug 2014 01:09:24 +0000 (18:09 -0700)
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>
net/ipv4/gre_demux.c

index 0485bf7f8f030d59bc6e9ee499051e99d9ab53d6..7c1a8ff974dd1b5a6beb016082c7af2682b65950 100644 (file)
@@ -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++;
        }