diff options
| author | Miika Komu | 2006-12-01 01:40:43 +0100 |
|---|---|---|
| committer | David S. Miller | 2006-12-03 06:31:48 +0100 |
| commit | 76b3f055f38954c67dab13844eb92203580038f8 (patch) | |
| tree | 59655690a408aef422e65660c41a51789ea2294f /net | |
| parent | [TCP] MD5SIG: Kill CONFIG_TCP_MD5SIG_DEBUG. (diff) | |
| download | kernel-qcow2-linux-76b3f055f38954c67dab13844eb92203580038f8.tar.gz kernel-qcow2-linux-76b3f055f38954c67dab13844eb92203580038f8.tar.xz kernel-qcow2-linux-76b3f055f38954c67dab13844eb92203580038f8.zip | |
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index e5ea1347a4ff..64d3938f74c4 100644 --- a/net/xfrm/xfrm_policy.c +++ b/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) |