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/key/af_key.c

diff --git a/net/key/af_key.c b/net/key/af_key.c
index 8b5f486..e9ef9af 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1219,7 +1219,7 @@
 		x->sel.prefixlen_s = addr->sadb_address_prefixlen;
 	}
 
-	if (!x->sel.family)
+	if (x->props.mode == XFRM_MODE_TRANSPORT)
 		x->sel.family = x->props.family;
 
 	if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {