From 31d25f3d91ab83fbab9ad01ede2624a8825e45b9 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 9 Apr 2008 15:08:24 -0700
Subject: [PATCH] --- yaml --- r: 88258 b: refs/heads/master c:
 bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f4e6da8c7678..c4e9c1e519e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21f644f3eabde637f255f75ad05d0821a7a36b7f
+refs/heads/master: bcf0dda8d2408fe1c1040cdec5a98e5fcad2ac72
diff --git a/trunk/net/xfrm/xfrm_user.c b/trunk/net/xfrm/xfrm_user.c
index 5d96f2728dc6..019d21de19b3 100644
--- a/trunk/net/xfrm/xfrm_user.c
+++ b/trunk/net/xfrm/xfrm_user.c
@@ -288,7 +288,7 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
 	memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
 	x->props.flags = p->flags;
 
-	if (x->props.mode == XFRM_MODE_TRANSPORT)
+	if (!x->sel.family)
 		x->sel.family = p->family;
 
 }