Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76b3f055 authored Nov 30, 2006 by Miika Komu Committed by David S. Miller Dec 02, 2006

[IPSEC]: Add encapsulation family.



Signed-off-by: Miika Komu <miika@iki.fi>
Signed-off-by: Diego Beltrami <Diego.Beltrami@hiit.fi>
Signed-off-by: Kazunori Miyazawa <miyazawa@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 08dd1a50

include/net/xfrm.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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. */

net/xfrm/xfrm_policy.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)