diff options
| author |   David Ahern <dsa@cumulusnetworks.com> | 2015-08-13 14:59:02 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-13 22:43:20 -0700 |
| commit | 613d09b30f8b589d5a9b49775054c8865db95d1c (patch) | |
| tree | 93178a4839a7caaca7b9318bc2736dc1c5676859 /include | |
| parent | net: Use VRF device index for lookups on RX (diff) | |
| download | linux-dev-613d09b30f8b589d5a9b49775054c8865db95d1c.tar.xz linux-dev-613d09b30f8b589d5a9b49775054c8865db95d1c.zip | |
net: Use VRF device index for lookups on TX
As with ingress use the index of VRF master device for route lookups on
egress. However, the oif should only be used to direct the lookups to a
specific table. Routes in the table are not based on the VRF device but
rather interfaces that are part of the VRF so do not consider the oif for
lookups within the table. The FLOWI_FLAG_VRFSRC is used to control this
latter part.
Signed-off-by: Shrijeet Mukherjee <shm@cumulusnetworks.com>
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/flow.h | 1 | ||||
| -rw-r--r-- | include/net/route.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/net/flow.h b/include/net/flow.h index 3098ae33a178..f305588fc162 100644 --- a/include/net/flow.h +++ b/include/net/flow.h @@ -33,6 +33,7 @@ struct flowi_common { __u8 flowic_flags; #define FLOWI_FLAG_ANYSRC 0x01 #define FLOWI_FLAG_KNOWN_NH 0x02 +#define FLOWI_FLAG_VRFSRC 0x04 __u32 flowic_secid; struct flowi_tunnel flowic_tun_key; }; diff --git a/include/net/route.h b/include/net/route.h index 2d45f419477f..94189d4bd899 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -251,6 +251,9 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32 if (inet_sk(sk)->transparent) flow_flags |= FLOWI_FLAG_ANYSRC; + if (netif_index_is_vrf(sock_net(sk), oif)) + flow_flags |= FLOWI_FLAG_VRFSRC; + flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE, protocol, flow_flags, dst, src, dport, sport); } |