commit df9dcb4588aca9cc243cf1f3f454361a84e1cbdb
author Kazunori MIYAZAWA <kazunori@miyazawa.org> Mon Mar 24 14:51:51 2008 -0700
committer David S. Miller <davem@davemloft.net> Mon Mar 24 14:51:51 2008 -0700
tree 53dabed7cffee752109808cbea2f812e0a6d7faf
parent fa86d322d89995fef1bfb5cc768b89d8c22ea0d9

[IPSEC]: Fix inter address family IPsec tunnel handling.

Signed-off-by: Kazunori MIYAZAWA <kazunori@miyazawa.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv4/xfrm4_mode_tunnel.c

diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index 8dee617..584e6d7 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -41,7 +41,7 @@
 	top_iph->ihl = 5;
 	top_iph->version = 4;
 
-	top_iph->protocol = x->inner_mode->afinfo->proto;
+	top_iph->protocol = xfrm_af2proto(skb->dst->ops->family);
 
 	/* DS disclosed */
 	top_iph->tos = INET_ECN_encapsulate(XFRM_MODE_SKB_CB(skb)->tos,