From ca4aa976f04d14bc7da60dce0e2afc34c9f0f1d2 Mon Sep 17 00:00:00 2001 From: Nicolas Dichtel Date: Tue, 10 May 2016 16:08:17 +0200 Subject: [PATCH] ipv6: fix 4in6 tunnel receive path Protocol for 4in6 tunnel is IPPROTO_IPIP. This was wrongly changed by the last cleanup. CC: Tom Herbert Fixes: 0d3c703a9d17 ("ipv6: Cleanup IPv6 tunnel receive path") Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller --- net/ipv6/ip6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 50af7061ecdb..e79330f214bd 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -897,7 +897,7 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto, 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); } -- GitLab