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

Commit 956b4531 authored by Jakub Sitnicki's avatar Jakub Sitnicki Committed by David S. Miller
Browse files

ipv6: Fold rt6_info_hash_nhsfn() into its only caller 



Commit 644d0e65 ("ipv6 Use get_hash_from_flowi6 for rt6 hash") has
turned rt6_info_hash_nhsfn() into a one-liner, so it no longer makes
sense to keep it around. Also remove the accompanying comment that has
become outdated.

Signed-off-by: default avatarJakub Sitnicki <jkbs@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23aebdac

net/ipv6/route.c

+1 −11
Original line number Diff line number Diff line
@@ -445,16 +445,6 @@ static bool rt6_check_expired(const struct rt6_info *rt) 
	return false;

}



/* Multipath route selection:

 *   Hash based function using packet header and flowlabel.

 * Adapted from fib_info_hashfn()

 */

static int rt6_info_hash_nhsfn(unsigned int candidate_count,

			       const struct flowi6 *fl6)

{

	return get_hash_from_flowi6(fl6) % candidate_count;

}



static struct rt6_info *rt6_multipath_select(struct rt6_info *match,

					     struct flowi6 *fl6, int oif,

					     int strict)
@@ -462,7 +452,7 @@ static struct rt6_info *rt6_multipath_select(struct rt6_info *match, 
	struct rt6_info *sibling, *next_sibling;

	int route_choosen;



	route_choosen = rt6_info_hash_nhsfn(match->rt6i_nsiblings + 1, fl6);

	route_choosen = get_hash_from_flowi6(fl6) % (match->rt6i_nsiblings + 1);

	/* Don't change the route, if route_choosen == 0

	 * (siblings does not include ourself)

	 */