diff options
| author | Jakub Sitnicki <jkbs@redhat.com> | 2017-08-23 09:58:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-25 03:21:17 +0200 |
| commit | 956b45318a27cefa5e99fbbbe703ea8a2a3aee13 (patch) | |
| tree | a15b83327b10c347ea342acc1f1f9c07a183f716 /net/ipv6 | |
| parent | ipv6: Compute multipath hash for ICMP errors from offending packet (diff) | |
| download | linux-956b45318a27cefa5e99fbbbe703ea8a2a3aee13.tar.xz linux-956b45318a27cefa5e99fbbbe703ea8a2a3aee13.zip | |
ipv6: Fold rt6_info_hash_nhsfn() into its only caller
Commit 644d0e656958 ("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: Jakub Sitnicki <jkbs@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 6c4dd5796a31..246e7d7d30a4 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -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) */ |