net/ipv4: Simplify fib_select_path
Subsystems (3)
PATCH 1/1 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 <[email protected]>
--- net/ipv4/fib_semantics.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
net/ipv4/fib_semantics.c +5 -6
@@ -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); }
Signature · 1 line
2.11.0
From: David Ahern <[email protected]>
Date: Tue, 13 Feb 2018 08:11:34 -0800
Quoted 4 lines
If flow oif is set and it is not an l3mdev, then
fib_select_pathcan jump to the source address check.Signed-off-by David Ahern <[email protected]>
Applied.