Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / net / ipv6 / ip6_tunnel.c

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 50af7061ecdbee6ed7b9fe73c5a6ceb123a8d2ea..e79330f214bd56bd061fd994ac5834ac1403583d 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -897,7 +897,7 @@ drop:
 
 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);
 }