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

Commit 1b7fe593 authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Kill flowi arg to fib_select_multipath() 



Completely unused.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff3fccb3

include/net/ip_fib.h

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ extern int fib_sync_down_dev(struct net_device *dev, int force); 
extern int fib_sync_down_addr(struct net *net, __be32 local);

extern void fib_update_nh_saddrs(struct net_device *dev);

extern int fib_sync_up(struct net_device *dev);

extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res);

extern void fib_select_multipath(struct fib_result *res);



/* Exported by fib_trie.c */

extern void fib_trie_init(void);

net/ipv4/fib_semantics.c

+1 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ int fib_sync_up(struct net_device *dev) 
 * The algorithm is suboptimal, but it provides really

 * fair weighted route distribution.

 */

void fib_select_multipath(const struct flowi *flp, struct fib_result *res)

void fib_select_multipath(struct fib_result *res)

{

	struct fib_info *fi = res->fi;

	int w;

net/ipv4/route.c

+2 −2
Original line number Diff line number Diff line
@@ -2048,7 +2048,7 @@ static int ip_mkroute_input(struct sk_buff *skb, 


#ifdef CONFIG_IP_ROUTE_MULTIPATH

	if (res->fi && res->fi->fib_nhs > 1)

		fib_select_multipath(fl, res);

		fib_select_multipath(res);

#endif



	/* create a routing cache entry */
@@ -2598,7 +2598,7 @@ static struct rtable *ip_route_output_slow(struct net *net, 


#ifdef CONFIG_IP_ROUTE_MULTIPATH

	if (res.fi->fib_nhs > 1 && fl.oif == 0)

		fib_select_multipath(&fl, &res);

		fib_select_multipath(&res);

	else

#endif

	if (!res.prefixlen && res.type == RTN_UNICAST && !fl.oif)