From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: [PATCH net-next 4/7] net/ipv6: Move ndisc_hashfn to ndisc_hash Date: Wed, 5 Dec 2018 15:34:11 -0800 Message-ID: <20181205233414.1386-5-dsahern@kernel.org> References: <20181205233414.1386-1-dsahern@kernel.org> Cc: davem@davemloft.net, David Ahern To: netdev@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:53902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727592AbeLEXd1 (ORCPT ); Wed, 5 Dec 2018 18:33:27 -0500 In-Reply-To: <20181205233414.1386-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: From: David Ahern There are no more direct references to ndisc_hashfn so fold it into ndisc_hash, the hash callback for ndisc. Signed-off-by: David Ahern --- include/net/ndisc.h | 10 ---------- net/ipv6/ndisc.c | 7 ++++++- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/net/ndisc.h b/include/net/ndisc.h index c354345c679b..83a84f68901b 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -364,16 +364,6 @@ static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, ndisc_addr_option_pad(dev->type)); } -static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, __u32 *hash_rnd) -{ - const u32 *p32 = pkey; - - return (((p32[0] ^ hash32_ptr(dev)) * hash_rnd[0]) + - (p32[1] * hash_rnd[1]) + - (p32[2] * hash_rnd[2]) + - (p32[3] * hash_rnd[3])); -} - static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey) { return __neigh_lookup_noref(&nd_tbl, pkey, dev); diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 659ecf4e4b3c..304a32b3c3f5 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -311,7 +311,12 @@ static u32 ndisc_hash(const void *pkey, const struct net_device *dev, __u32 *hash_rnd) { - return ndisc_hashfn(pkey, dev, hash_rnd); + const u32 *p32 = pkey; + + return (((p32[0] ^ hash32_ptr(dev)) * hash_rnd[0]) + + (p32[1] * hash_rnd[1]) + + (p32[2] * hash_rnd[2]) + + (p32[3] * hash_rnd[3])); } static bool ndisc_key_eq(const struct neighbour *n, const void *pkey) -- 2.11.0