]> git.karo-electronics.de Git - linux-beck.git/commit
net: ipv4: Fix multipath selection with vrf
authorDavid Ahern <dsa@cumulusnetworks.com>
Tue, 10 Jan 2017 22:37:35 +0000 (14:37 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 15 Jan 2017 12:42:55 +0000 (13:42 +0100)
commit7b7a5a85b1d90efbad5b5c9efe8a06e13832ec01
tree8f12ee6f579cd956cec3e3383c846bcf34408c72
parent7cc73483a4c7f0a2ac71b590ca35877f43bf0f2d
net: ipv4: Fix multipath selection with vrf

[ Upstream commit 7a18c5b9fb31a999afc62b0e60978aa896fc89e9 ]

fib_select_path does not call fib_select_multipath if oif is set in the
flow struct. For VRF use cases oif is always set, so multipath route
selection is bypassed. Use the FLOWI_FLAG_SKIP_NH_OIF to skip the oif
check similar to what is done in fib_table_lookup.

Add saddr and proto to the flow struct for the fib lookup done by the
VRF driver to better match hash computation for a flow.

Fixes: 613d09b30f8b ("net: Use VRF device index for lookups on TX")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/vrf.c
net/ipv4/fib_semantics.c