From c6d14e3c0aa8c260cb438f597147451f065c2f04 Mon Sep 17 00:00:00 2001
From: Kazunori MIYAZAWA <kazunori@miyazawa.org>
Date: Wed, 21 May 2008 13:26:11 -0700
Subject: [PATCH] --- yaml --- r: 97182 b: refs/heads/master c:
 4da5105687e0993a3bbdcffd89b2b94d9377faab h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/key/af_key.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3877ab33cfe1..fd4281da8240 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8ac48d4cbae0cc59b7784399292fbda3e231be3
+refs/heads/master: 4da5105687e0993a3bbdcffd89b2b94d9377faab
diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c
index 9e7236ff6bcc..9bba7ac5fee0 100644
--- a/trunk/net/key/af_key.c
+++ b/trunk/net/key/af_key.c
@@ -1251,7 +1251,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr,
 		x->sel.prefixlen_s = addr->sadb_address_prefixlen;
 	}
 
-	if (x->props.mode == XFRM_MODE_TRANSPORT)
+	if (!x->sel.family)
 		x->sel.family = x->props.family;
 
 	if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {