---

yaml --- r: 41955 b: refs/heads/master c: 76b3f05 h: refs/heads/master i: 41953: dcc437c 41951: 81d7c51 v: v3
git-mirror · Dec 3, 2006 · 99f9b33 · 99f9b33
1 parent b9e9055
commit 99f9b33
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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)