ipv6: fix 4in6 tunnel receive path

NicolasDichtel · davem330 · commit ca4aa976f04d · 2016-05-11T19:23:55.000-04:00
Protocol for 4in6 tunnel is IPPROTO_IPIP. This was wrongly changed by the last cleanup. CC: Tom Herbert <tom@herbertland.com> Fixes: 0d3c703 ("ipv6: Cleanup IPv6 tunnel receive path") Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -897,7 +897,7 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto,`
`897`	`897`
`898`	`898`	`static int ip4ip6_rcv(struct sk_buff *skb)`
`899`	`899`	`{`
`900`		`- return ipxip6_rcv(skb, IPPROTO_IP, &tpi_v4,`
	`900`	`+ return ipxip6_rcv(skb, IPPROTO_IPIP, &tpi_v4,`
`901`	`901`	`ip4ip6_dscp_ecn_decapsulate);`
`902`	`902`	`}`
`903`	`903`