diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2015-09-15 15:10:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-17 16:36:34 -0700 |
| commit | 58189ca7b27411c3dc9a5cb9eeee0906da684c59 (patch) | |
| tree | a193039f8278a234772c8a84fc21aaead1370457 /include/net/flow.h | |
| parent | d828755eae637c6ca39e30702e98abaf34cac146 (diff) | |
net: Fix vti use case with oif in dst lookups
Steffen reported that the recent change to add oif to dst lookups breaks
the VTI use case. The problem is that with the oif set in the flow struct
the comparison to the nh_oif is triggered. Fix by splitting the
FLOWI_FLAG_VRFSRC into 2 flags -- one that triggers the vrf device cache
bypass (FLOWI_FLAG_VRFSRC) and another telling the lookup to not compare
nh oif (FLOWI_FLAG_SKIP_NH_OIF).
Fixes: 42a7b32b73d6 ("xfrm: Add oif to dst lookups")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/flow.h')
| -rw-r--r-- | include/net/flow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/flow.h b/include/net/flow.h index acd6a096250e..9b85db85f13c 100644 --- a/include/net/flow.h +++ b/include/net/flow.h @@ -35,6 +35,7 @@ struct flowi_common { #define FLOWI_FLAG_ANYSRC 0x01 #define FLOWI_FLAG_KNOWN_NH 0x02 #define FLOWI_FLAG_VRFSRC 0x04 +#define FLOWI_FLAG_SKIP_NH_OIF 0x08 __u32 flowic_secid; struct flowi_tunnel flowic_tun_key; }; |