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/ipv4/ip_gre.c | |
| parent | ip6_gre: Fix get_size calculation for gre6 tunnel (diff) | |
| download | linux-dev-da73b4e9538b9be96498241ab3f13eab94181e96.tar.xz linux-dev-da73b4e9538b9be96498241ab3f13eab94181e96.zip | |
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/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 2b267e71ebf5..aaeb478b54cd 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -222,7 +222,7 @@ static void gre_err(struct sk_buff *skb, u32 info) struct tnl_ptk_info tpi; bool csum_err = false; - if (gre_parse_header(skb, &tpi, &csum_err) < 0) { + if (gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IP)) < 0) { if (!csum_err) /* ignore csum errors. */ return; } @@ -335,7 +335,7 @@ static int gre_rcv(struct sk_buff *skb) } #endif - hdr_len = gre_parse_header(skb, &tpi, &csum_err); + hdr_len = gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IP)); if (hdr_len < 0) goto drop; |