diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-02-13 08:11:34 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-02-13 14:00:57 -0500 |
| commit | 0d876f2c6de5b1b00c2fd38bb4f4692e720207b1 (patch) | |
| tree | 1b6dfe55bd2c69fc829d524354ca575d96ea64fe /net/ipv4 | |
| parent | Merge branch 'sctp-rename-sctp-diag-file-and-add-file-comments-for-it' (diff) | |
| download | linux-dev-0d876f2c6de5b1b00c2fd38bb4f4692e720207b1.tar.xz linux-dev-0d876f2c6de5b1b00c2fd38bb4f4692e720207b1.zip | |
net/ipv4: Simplify fib_select_path
If flow oif is set and it is not an l3mdev, then fib_select_path
can jump to the source address check.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index c586597da20d..0b8c0a719f3e 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -1760,13 +1760,11 @@ void fib_select_multipath(struct fib_result *res, int hash) void fib_select_path(struct net *net, struct fib_result *res, struct flowi4 *fl4, const struct sk_buff *skb) { - bool oif_check; - - oif_check = (fl4->flowi4_oif == 0 || - fl4->flowi4_flags & FLOWI_FLAG_SKIP_NH_OIF); + if (fl4->flowi4_oif && !(fl4->flowi4_flags & FLOWI_FLAG_SKIP_NH_OIF)) + goto check_saddr; #ifdef CONFIG_IP_ROUTE_MULTIPATH - if (res->fi->fib_nhs > 1 && oif_check) { + if (res->fi->fib_nhs > 1) { int h = fib_multipath_hash(res->fi, fl4, skb); fib_select_multipath(res, h); @@ -1775,9 +1773,10 @@ void fib_select_path(struct net *net, struct fib_result *res, #endif if (!res->prefixlen && res->table->tb_num_default > 1 && - res->type == RTN_UNICAST && oif_check) + res->type == RTN_UNICAST) fib_select_default(fl4, res); +check_saddr: if (!fl4->saddr) fl4->saddr = FIB_RES_PREFSRC(net, *res); } |