public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipv6: fix 4in6 tunnel receive path

Browse source 
Protocol for 4in6 tunnel is IPPROTO_IPIP. This was wrongly changed by
the last cleanup.

CC: Tom Herbert <tom@herbertland.com>
Fixes: 0d3c703a9d ("ipv6: Cleanup IPv6 tunnel receive path")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel 2016-05-10 16:08:17 +02:00 • committed by David S. Miller
parent 756ee1729b
commit ca4aa976f0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/ipv6/ip6_tunnel.c
View file

@ -897,7 +897,7 @@ drop:
static int ip4ip6_rcv(struct sk_buff *skb) static int ip4ip6_rcv(struct sk_buff *skb)
{ {
return ipxip6_rcv(skb, IPPROTO_IP, &tpi_v4, return ipxip6_rcv(skb, IPPROTO_IPIP, &tpi_v4,
ip4ip6_dscp_ecn_decapsulate); ip4ip6_dscp_ecn_decapsulate);
} }