6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenz Bauer lmb@isovalent.com
commit 74bdfab4fd7c641e55f7fe9d1be9687eeb01df67 upstream.
There are already INDIRECT_CALLABLE_DECLARE in the hashtable headers, no need to declare them again.
Fixes: 0f495f761722 ("net: remove duplicate reuseport_lookup functions") Suggested-by: Martin Lau martin.lau@linux.dev Signed-off-by: Lorenz Bauer lmb@isovalent.com Reviewed-by: Kuniyuki Iwashima kuniyu@amazon.com Link: https://lore.kernel.org/r/20230731-indir-call-v1-1-4cd0aeaee64f@isovalent.co... Signed-off-by: Martin KaFai Lau martin.lau@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- net/ipv4/inet_hashtables.c | 2 -- net/ipv6/inet6_hashtables.c | 2 -- 2 files changed, 4 deletions(-)
--- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -333,8 +333,6 @@ static inline int compute_score(struct s return score; }
-INDIRECT_CALLABLE_DECLARE(inet_ehashfn_t udp_ehashfn); - struct sock *inet_lookup_reuseport(struct net *net, struct sock *sk, struct sk_buff *skb, int doff, __be32 saddr, __be16 sport, --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -112,8 +112,6 @@ static inline int compute_score(struct s return score; }
-INDIRECT_CALLABLE_DECLARE(inet6_ehashfn_t udp6_ehashfn); - struct sock *inet6_lookup_reuseport(struct net *net, struct sock *sk, struct sk_buff *skb, int doff, const struct in6_addr *saddr,