From bc6ad26e381dc2d1e0504449ced7f861cd2ca3c1 Mon Sep 17 00:00:00 2001
From: Miika Komu <miika@iki.fi>
Date: Thu, 30 Nov 2006 16:40:51 -0800
Subject: [PATCH] --- yaml --- r: 41956 b: refs/heads/master c:
 8511d01d7c70200ffd42debba9d7ac5c4f7f1031 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 99ce8dded090..cbe0278fbdad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76b3f055f38954c67dab13844eb92203580038f8
+refs/heads/master: 8511d01d7c70200ffd42debba9d7ac5c4f7f1031
diff --git a/trunk/net/xfrm/xfrm_user.c b/trunk/net/xfrm/xfrm_user.c
index 6b461da0b51c..055b72fb37bc 100644
--- a/trunk/net/xfrm/xfrm_user.c
+++ b/trunk/net/xfrm/xfrm_user.c
@@ -858,6 +858,7 @@ static void copy_templates(struct xfrm_policy *xp, struct xfrm_user_tmpl *ut,
 	int i;
 
 	xp->xfrm_nr = nr;
+	xp->family = ut->family;
 	for (i = 0; i < nr; i++, ut++) {
 		struct xfrm_tmpl *t = &xp->xfrm_vec[i];
 
@@ -871,6 +872,7 @@ static void copy_templates(struct xfrm_policy *xp, struct xfrm_user_tmpl *ut,
 		t->aalgos = ut->aalgos;
 		t->ealgos = ut->ealgos;
 		t->calgos = ut->calgos;
+		t->encap_family = ut->family;
 	}
 }
 
@@ -1024,7 +1026,7 @@ static int copy_to_user_tmpl(struct xfrm_policy *xp, struct sk_buff *skb)
 		struct xfrm_tmpl *kp = &xp->xfrm_vec[i];
 
 		memcpy(&up->id, &kp->id, sizeof(up->id));
-		up->family = xp->family;
+		up->family = kp->encap_family;
 		memcpy(&up->saddr, &kp->saddr, sizeof(up->saddr));
 		up->reqid = kp->reqid;
 		up->mode = kp->mode;