Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d876f2c authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3174a944

net/ipv4/fib_semantics.c

+5 −6
Original line number Diff line number Diff line
@@ -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);

}