From: Lorenz Bauer <lmb@isovalent.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@kernel.org>,
Kuniyuki Iwashima <kuniyu@amazon.com>
Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
Martin Lau <martin.lau@linux.dev>,
Lorenz Bauer <lmb@isovalent.com>
Subject: [PATCH bpf-next] net: remove duplicate INDIRECT_CALLABLE_DECLARE of udp[6]_ehashfn
Date: Mon, 31 Jul 2023 11:42:53 +0200 [thread overview]
Message-ID: <20230731-indir-call-v1-1-4cd0aeaee64f@isovalent.com> (raw)
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>
---
As pointed out by Martin there are some duplicate macro invocations
in my recent SO_REUSEPORT support for sk_assign patchset.
Remove the declarations in the .c files.
---
net/ipv4/inet_hashtables.c | 2 --
net/ipv6/inet6_hashtables.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 6a872b8fb0d3..7876b7d703cb 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -333,8 +333,6 @@ static inline int compute_score(struct sock *sk, struct net *net,
return score;
}
-INDIRECT_CALLABLE_DECLARE(inet_ehashfn_t udp_ehashfn);
-
/**
* inet_lookup_reuseport() - execute reuseport logic on AF_INET socket if necessary.
* @net: network namespace.
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index 7c9700c7c9c8..b0e8d278e8a9 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -112,8 +112,6 @@ static inline int compute_score(struct sock *sk, struct net *net,
return score;
}
-INDIRECT_CALLABLE_DECLARE(inet6_ehashfn_t udp6_ehashfn);
-
/**
* inet6_lookup_reuseport() - execute reuseport logic on AF_INET6 socket if necessary.
* @net: network namespace.
---
base-commit: fb213ecbb8ac56b2d5569737f59126e91f87829a
change-id: 20230731-indir-call-f1474e314184
Best regards,
--
Lorenz Bauer <lmb@isovalent.com>
next reply other threads:[~2023-07-31 9:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-31 9:42 Lorenz Bauer [this message]
2023-07-31 18:56 ` Kuniyuki Iwashima
2023-07-31 21:00 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230731-indir-call-v1-1-4cd0aeaee64f@isovalent.com \
--to=lmb@isovalent.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kuniyu@amazon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.lau@kernel.org \
--cc=martin.lau@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®