diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2016-05-11 12:48:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-12 22:53:58 +0200 |
| commit | da73b4e9538b9be96498241ab3f13eab94181e96 (patch) | |
| tree | b22bf974053d15e37a25aa8dcf9c18a51bbd0181 /include/net | |
| parent | ip6_gre: Fix get_size calculation for gre6 tunnel (diff) | |
| download | linux-da73b4e9538b9be96498241ab3f13eab94181e96.tar.xz 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 'include/net')
| -rw-r--r-- | include/net/gre.h | 2 |
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) { |