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/gre_demux.c | |
| parent | 23f72215bc030d1eea437713abfef91c635e2e1f (diff) | |
| download | talos-obmc-linux-da73b4e9538b9be96498241ab3f13eab94181e96.tar.gz talos-obmc-linux-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/gre_demux.c')
| -rw-r--r-- | net/ipv4/gre_demux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index d78e2eefc0f7..4c39f4fd332a 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -62,7 +62,7 @@ EXPORT_SYMBOL_GPL(gre_del_protocol); /* Fills in tpi and returns header length to be pulled. */ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, - bool *csum_err) + bool *csum_err, __be16 proto) { const struct gre_base_hdr *greh; __be32 *options; @@ -109,11 +109,11 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, tpi->seq = 0; } /* WCCP version 1 and 2 protocol decoding. - * - Change protocol to IP + * - Change protocol to IPv4/IPv6 * - When dealing with WCCPv2, Skip extra 4 bytes in GRE header */ if (greh->flags == 0 && tpi->proto == htons(ETH_P_WCCP)) { - tpi->proto = htons(ETH_P_IP); + tpi->proto = proto; if ((*(u8 *)options & 0xF0) != 0x40) hdr_len += 4; } |
