[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>
This commit is contained in:
parent
08dd1a506b
commit
76b3f055f3
|
@ -310,6 +310,8 @@ struct xfrm_tmpl
|
||||||
/* Source address of tunnel. Ignored, if it is not a tunnel. */
|
/* Source address of tunnel. Ignored, if it is not a tunnel. */
|
||||||
xfrm_address_t saddr;
|
xfrm_address_t saddr;
|
||||||
|
|
||||||
|
unsigned short encap_family;
|
||||||
|
|
||||||
__u32 reqid;
|
__u32 reqid;
|
||||||
|
|
||||||
/* Mode: transport, tunnel etc. */
|
/* Mode: transport, tunnel etc. */
|
||||||
|
|
|
@ -1211,6 +1211,7 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, struct flowi *fl,
|
||||||
if (tmpl->mode == XFRM_MODE_TUNNEL) {
|
if (tmpl->mode == XFRM_MODE_TUNNEL) {
|
||||||
remote = &tmpl->id.daddr;
|
remote = &tmpl->id.daddr;
|
||||||
local = &tmpl->saddr;
|
local = &tmpl->saddr;
|
||||||
|
family = tmpl->encap_family;
|
||||||
if (xfrm_addr_any(local, family)) {
|
if (xfrm_addr_any(local, family)) {
|
||||||
error = xfrm_get_saddr(&tmp, remote, family);
|
error = xfrm_get_saddr(&tmp, remote, family);
|
||||||
if (error)
|
if (error)
|
||||||
|
|
Reference in New Issue