diff --git a/[refs] b/[refs]
index ff22c7a836aa..e0d3072fb2fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3516ffb0fef710749daf288c0fe146503e0cf9d4
+refs/heads/master: 4a4b6271a8df417e328aed4c8a7e04e0b282207e
diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c
index 7b0a95abe934..5502df115a63 100644
--- a/trunk/net/key/af_key.c
+++ b/trunk/net/key/af_key.c
@@ -1206,6 +1206,9 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr,
 		x->sel.prefixlen_s = addr->sadb_address_prefixlen;
 	}
 
+	if (!x->sel.family)
+		x->sel.family = x->props.family;
+
 	if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {
 		struct sadb_x_nat_t_type* n_type;
 		struct xfrm_encap_tmpl *natt;