From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: [PATCH net-next 1/7] neighbor: Remove open coding of key and hash functions Date: Wed, 5 Dec 2018 15:34:08 -0800 Message-ID: <20181205233414.1386-2-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]:53880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727645AbeLEXd1 (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 ___neigh_lookup_noref takes the key and hash functions as inputs, yet those are part of the operations listed in the neigh_table which is also passed as an arugment. Remove the open coding of these internal implementations by converting uses of ___neigh_lookup_noref to __neigh_lookup_noref. For IPv4, arp_key_eq is essentially a call to neigh_key_eq32 and arp_hash is a call to arp_hashfn. Similarly for IPv6, ndisc_key_eq calls neigh_key_eq128 and ndisc_hash calls ndisc_hashfn. So the change in helpers is a no-op. Signed-off-by: David Ahern --- include/net/arp.h | 2 +- include/net/ndisc.h | 2 +- net/core/filter.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/net/arp.h b/include/net/arp.h index 977aabfcdc03..a5091f13cd3e 100644 --- a/include/net/arp.h +++ b/include/net/arp.h @@ -23,7 +23,7 @@ static inline struct neighbour *__ipv4_neigh_lookup_noref(struct net_device *dev if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT)) key = INADDR_ANY; - return ___neigh_lookup_noref(&arp_tbl, neigh_key_eq32, arp_hashfn, &key, dev); + return __neigh_lookup_noref(&arp_tbl, &key, dev); } static inline struct neighbour *__ipv4_neigh_lookup(struct net_device *dev, u32 key) diff --git a/include/net/ndisc.h b/include/net/ndisc.h index ddfbb591e2c5..c354345c679b 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -376,7 +376,7 @@ static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, _ static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey) { - return ___neigh_lookup_noref(&nd_tbl, neigh_key_eq128, ndisc_hashfn, pkey, dev); + return __neigh_lookup_noref(&nd_tbl, pkey, dev); } static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, const void *pkey) diff --git a/net/core/filter.c b/net/core/filter.c index bd0df75dc7b6..f10cc675783c 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4668,8 +4668,7 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params, * not needed here. Can not use __ipv6_neigh_lookup_noref here * because we need to get nd_tbl via the stub */ - neigh = ___neigh_lookup_noref(ipv6_stub->nd_tbl, neigh_key_eq128, - ndisc_hashfn, dst, dev); + neigh = __neigh_lookup_noref(ipv6_stub->nd_tbl, dst, dev); if (!neigh) return BPF_FIB_LKUP_RET_NO_NEIGH; -- 2.11.0