diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2016-05-11 18:48:32 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-12 16:53:58 -0400 |
| commit | da73b4e9538b9be96498241ab3f13eab94181e96 (patch) | |
| tree | b22bf974053d15e37a25aa8dcf9c18a51bbd0181 /net/ipv6/ip6_gre.c | |
| parent | 23f72215bc030d1eea437713abfef91c635e2e1f (diff) | |
gre: Fix wrong tpi->proto in WCCP
When dealing with WCCP in gre6 tunnel, it sets the wrong tpi->protocol,
that is, ETH_P_IP instead of ETH_P_IPV6 for the encapuslated traffic.
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 3c25fe67d3da..4541fa54035e 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -468,7 +468,7 @@ static int gre_rcv(struct sk_buff *skb) bool csum_err = false; int hdr_len; - hdr_len = gre_parse_header(skb, &tpi, &csum_err); + hdr_len = gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IPV6)); if (hdr_len < 0) goto drop; |