diff --git a/[refs] b/[refs]
index fcd93101a165..9dada29dc942 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e242297055f906e8e225fb95a8edbc88e9052634
+refs/heads/master: b1641064a3f4a58644bc2e8edf40c025c58473b4
diff --git a/trunk/net/ipv4/xfrm4_tunnel.c b/trunk/net/ipv4/xfrm4_tunnel.c
index 87f77e412ba2..41f5982d2087 100644
--- a/trunk/net/ipv4/xfrm4_tunnel.c
+++ b/trunk/net/ipv4/xfrm4_tunnel.c
@@ -50,7 +50,7 @@ static const struct xfrm_type ipip_type = {
 
 static int xfrm_tunnel_rcv(struct sk_buff *skb)
 {
-	return xfrm4_rcv_spi(skb, IPPROTO_IP, ip_hdr(skb)->saddr);
+	return xfrm4_rcv_spi(skb, IPPROTO_IPIP, ip_hdr(skb)->saddr);
 }
 
 static int xfrm_tunnel_err(struct sk_buff *skb, u32 info)