From 4287a4029a77228f6a47b13a7eddc2b7e31d40fe Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 17 Oct 2007 21:28:06 -0700
Subject: [PATCH] --- yaml --- r: 71283 b: refs/heads/master c:
 04663d0b8b3c8ce3804106279420cfe5bdfcce3c h: refs/heads/master i:   71281:
 4cd91b3c21a099daac5d217dc18d7196e224604b   71279:
 40d23944773ff571dfcde8dbea811d3f84763a59 v: v3

---
 [refs]                        | 2 +-
 trunk/net/ipv4/xfrm4_tunnel.c | 2 +-
 trunk/net/ipv6/xfrm6_tunnel.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 17fbe15e10ac..e66f353c501a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaf70ec7fde2321281b2a49c7c9f881c90d0d208
+refs/heads/master: 04663d0b8b3c8ce3804106279420cfe5bdfcce3c
diff --git a/trunk/net/ipv4/xfrm4_tunnel.c b/trunk/net/ipv4/xfrm4_tunnel.c
index 1312417608e2..83e9580feac4 100644
--- a/trunk/net/ipv4/xfrm4_tunnel.c
+++ b/trunk/net/ipv4/xfrm4_tunnel.c
@@ -18,7 +18,7 @@ static int ipip_output(struct xfrm_state *x, struct sk_buff *skb)
 
 static int ipip_xfrm_rcv(struct xfrm_state *x, struct sk_buff *skb)
 {
-	return IPPROTO_IP;
+	return ip_hdr(skb)->protocol;
 }
 
 static int ipip_init_state(struct xfrm_state *x)
diff --git a/trunk/net/ipv6/xfrm6_tunnel.c b/trunk/net/ipv6/xfrm6_tunnel.c
index 3f8a3abde67e..6c67ac197ee0 100644
--- a/trunk/net/ipv6/xfrm6_tunnel.c
+++ b/trunk/net/ipv6/xfrm6_tunnel.c
@@ -248,7 +248,7 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
 
 static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
 {
-	return 0;
+	return skb_network_header(skb)[IP6CB(skb)->nhoff];
 }
 
 static int xfrm6_tunnel_rcv(struct sk_buff *skb)