diff options
| author |   David Ahern <dsa@cumulusnetworks.com> | 2015-10-05 08:32:51 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-07 04:25:03 -0700 |
| commit | 6e28b000825d959cb0c0b8fea8c2f132ddc516dc (patch) | |
| tree | 156fa4372a9f981d1a60e0d21057f672fbc71966 /net/ipv6/xfrm6_policy.c | |
| parent | i40e/i40evf: set AQ count after memory allocation (diff) | |
| download | linux-dev-6e28b000825d959cb0c0b8fea8c2f132ddc516dc.tar.xz linux-dev-6e28b000825d959cb0c0b8fea8c2f132ddc516dc.zip | |
net: Fix vti use case with oif in dst lookups for IPv6
It occurred to me yesterday that 741a11d9e4103 ("net: ipv6: Add
RT6_LOOKUP_F_IFACE flag if oif is set") means that xfrm6_dst_lookup
needs the FLOWI_FLAG_SKIP_NH_OIF flag set. This latest commit causes
the oif to be considered in lookups which is known to break vti. This
explains why 58189ca7b274 did not the IPv6 change at the time it was
submitted.
Fixes: 42a7b32b73d6 ("xfrm: Add oif to dst lookups")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_policy.c')
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 30caa289c5db..5cedfda4b241 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -37,6 +37,7 @@ static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos, int oif, memset(&fl6, 0, sizeof(fl6)); fl6.flowi6_oif = oif; + fl6.flowi6_flags = FLOWI_FLAG_SKIP_NH_OIF; memcpy(&fl6.daddr, daddr, sizeof(fl6.daddr)); if (saddr) memcpy(&fl6.saddr, saddr, sizeof(fl6.saddr)); |