---

yaml --- r: 97182 b: refs/heads/master c: 4da5105 h: refs/heads/master v: v3
git-mirror · May 21, 2008 · c6d14e3 · c6d14e3
1 parent af39fba
commit c6d14e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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]) {