From 99f9b332c6bc38fdf678c1400bd3be933d328ea2 Mon Sep 17 00:00:00 2001
From: Miika Komu <miika@iki.fi>
Date: Thu, 30 Nov 2006 16:40:43 -0800
Subject: [PATCH] --- yaml --- r: 41955 b: refs/heads/master c:
 76b3f055f38954c67dab13844eb92203580038f8 h: refs/heads/master i:   41953:
 dcc437c9c22c32419e8ca7c0aadbfd51b23252a4   41951:
 81d7c517d5c3477dac32e5811fc08af99b6c3ab0 v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/xfrm.h     | 2 ++
 trunk/net/xfrm/xfrm_policy.c | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 404aa41b2fa0..99ce8dded090 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08dd1a506bbc4528db60dfdfff61423a1608ed3f
+refs/heads/master: 76b3f055f38954c67dab13844eb92203580038f8
diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h
index 984e5c45265c..15ec19dcf9c8 100644
--- a/trunk/include/net/xfrm.h
+++ b/trunk/include/net/xfrm.h
@@ -310,6 +310,8 @@ struct xfrm_tmpl
 /* Source address of tunnel. Ignored, if it is not a tunnel. */
 	xfrm_address_t		saddr;
 
+	unsigned short		encap_family;
+
 	__u32			reqid;
 
 /* Mode: transport, tunnel etc. */
diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c
index e5ea1347a4ff..64d3938f74c4 100644
--- a/trunk/net/xfrm/xfrm_policy.c
+++ b/trunk/net/xfrm/xfrm_policy.c
@@ -1211,6 +1211,7 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, struct flowi *fl,
 		if (tmpl->mode == XFRM_MODE_TUNNEL) {
 			remote = &tmpl->id.daddr;
 			local = &tmpl->saddr;
+			family = tmpl->encap_family;
 			if (xfrm_addr_any(local, family)) {
 				error = xfrm_get_saddr(&tmp, remote, family);
 				if (error)