Commit ca4aa976 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller

ipv6: fix 4in6 tunnel receive path

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

CC: Tom Herbert <tom@herbertland.com>
Fixes: 0d3c703a ("ipv6: Cleanup IPv6 tunnel receive path")
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 756ee172
...@@ -897,7 +897,7 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto, ...@@ -897,7 +897,7 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto,
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);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment