From 2f84ef5e01ce2bcddf4f9e373588bdad3ac15a6a Mon Sep 17 00:00:00 2001
From: Kazunori MIYAZAWA <kazunori@miyazawa.org>
Date: Tue, 29 May 2007 13:03:17 -0700
Subject: [PATCH] --- yaml --- r: 57157 b: refs/heads/master c:
 f282d45cb496e3960046afd3d5f241265eda6fde h: refs/heads/master i:   57155:
 abca7a37d7d065ef2408f0dd60c2cbfe76f963b2 v: v3

---
 [refs]                             | 2 +-
 trunk/net/ipv4/xfrm4_input.c       | 6 ++----
 trunk/net/ipv4/xfrm4_mode_tunnel.c | 2 ++
 trunk/net/ipv6/xfrm6_input.c       | 6 ++----
 trunk/net/ipv6/xfrm6_mode_tunnel.c | 1 +
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e47bc15049d0..0d3485304808 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83f03fa5adbad0a829424241ad24ef9e4b4ba585
+refs/heads/master: f282d45cb496e3960046afd3d5f241265eda6fde
diff --git a/trunk/net/ipv4/xfrm4_input.c b/trunk/net/ipv4/xfrm4_input.c
index 5ceca951d73f..fa1902dc81b8 100644
--- a/trunk/net/ipv4/xfrm4_input.c
+++ b/trunk/net/ipv4/xfrm4_input.c
@@ -139,10 +139,8 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type)
 	nf_reset(skb);
 
 	if (decaps) {
-		if (!(skb->dev->flags&IFF_LOOPBACK)) {
-			dst_release(skb->dst);
-			skb->dst = NULL;
-		}
+		dst_release(skb->dst);
+		skb->dst = NULL;
 		netif_rx(skb);
 		return 0;
 	} else {
diff --git a/trunk/net/ipv4/xfrm4_mode_tunnel.c b/trunk/net/ipv4/xfrm4_mode_tunnel.c
index a2f2e6a5ec5d..9963700e74c1 100644
--- a/trunk/net/ipv4/xfrm4_mode_tunnel.c
+++ b/trunk/net/ipv4/xfrm4_mode_tunnel.c
@@ -85,6 +85,8 @@ static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
 	top_iph->saddr = x->props.saddr.a4;
 	top_iph->daddr = x->id.daddr.a4;
 
+	skb->protocol = htons(ETH_P_IP);
+
 	memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
 	return 0;
 }
diff --git a/trunk/net/ipv6/xfrm6_input.c b/trunk/net/ipv6/xfrm6_input.c
index d7ed8aa56ec1..c858537cec4b 100644
--- a/trunk/net/ipv6/xfrm6_input.c
+++ b/trunk/net/ipv6/xfrm6_input.c
@@ -104,10 +104,8 @@ int xfrm6_rcv_spi(struct sk_buff *skb, __be32 spi)
 	nf_reset(skb);
 
 	if (decaps) {
-		if (!(skb->dev->flags&IFF_LOOPBACK)) {
-			dst_release(skb->dst);
-			skb->dst = NULL;
-		}
+		dst_release(skb->dst);
+		skb->dst = NULL;
 		netif_rx(skb);
 		return -1;
 	} else {
diff --git a/trunk/net/ipv6/xfrm6_mode_tunnel.c b/trunk/net/ipv6/xfrm6_mode_tunnel.c
index a6c0cdf46ad6..9fc95bc6509f 100644
--- a/trunk/net/ipv6/xfrm6_mode_tunnel.c
+++ b/trunk/net/ipv6/xfrm6_mode_tunnel.c
@@ -80,6 +80,7 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
 	top_iph->hop_limit = dst_metric(dst->child, RTAX_HOPLIMIT);
 	ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);
 	ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr);
+	skb->protocol = htons(ETH_P_IPV6);
 	return 0;
 }