gre: Fix wrong tpi->proto in WCCP
authorHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Wed, 11 May 2016 10:48:32 +0000 (18:48 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 May 2016 20:53:58 +0000 (16:53 -0400)
commitda73b4e9538b9be96498241ab3f13eab94181e96
treeb22bf974053d15e37a25aa8dcf9c18a51bbd0181
parent23f72215bc030d1eea437713abfef91c635e2e1f
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>
include/net/gre.h
net/ipv4/gre_demux.c
net/ipv4/ip_gre.c
net/ipv6/ip6_gre.c