summaryrefslogtreecommitdiff
path: root/include/net/gre.h
diff options
context:
space:
mode:
authorHaishuang Yan <yanhaishuang@cmss.chinamobile.com>2016-05-11 13:48:32 +0300
committerDavid S. Miller <davem@davemloft.net>2016-05-12 23:53:58 +0300
commitda73b4e9538b9be96498241ab3f13eab94181e96 (patch)
treeb22bf974053d15e37a25aa8dcf9c18a51bbd0181 /include/net/gre.h
parent23f72215bc030d1eea437713abfef91c635e2e1f (diff)
downloadlinux-da73b4e9538b9be96498241ab3f13eab94181e96.tar.xz
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 'include/net/gre.h')
-rw-r--r--include/net/gre.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/gre.h b/include/net/gre.h
index a14093c70eab..5dce30a6abe3 100644
--- a/include/net/gre.h
+++ b/include/net/gre.h
@@ -26,7 +26,7 @@ int gre_del_protocol(const struct gre_protocol *proto, u8 version);
struct net_device *gretap_fb_dev_create(struct net *net, const char *name,
u8 name_assign_type);
int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
- bool *csum_err);
+ bool *csum_err, __be16 proto);
static inline int gre_calc_hlen(__be16 o_flags)
{