From: Greg Kroah-Hartman Date: Mon, 11 Sep 2023 06:17:27 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.1.53~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b3e5ac88daaa9b1619dc5adf4031fdfb122a573;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch --- diff --git a/queue-5.15/net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch b/queue-5.15/net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch new file mode 100644 index 00000000000..675d8570a43 --- /dev/null +++ b/queue-5.15/net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch @@ -0,0 +1,46 @@ +From 74bdfab4fd7c641e55f7fe9d1be9687eeb01df67 Mon Sep 17 00:00:00 2001 +From: Lorenz Bauer +Date: Mon, 31 Jul 2023 11:42:53 +0200 +Subject: net: remove duplicate INDIRECT_CALLABLE_DECLARE of udp[6]_ehashfn + +From: Lorenz Bauer + +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 +Signed-off-by: Lorenz Bauer +Reviewed-by: Kuniyuki Iwashima +Link: https://lore.kernel.org/r/20230731-indir-call-v1-1-4cd0aeaee64f@isovalent.com +Signed-off-by: Martin KaFai Lau +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -253,8 +253,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 +@@ -114,8 +114,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, diff --git a/queue-5.15/series b/queue-5.15/series index d20c7ef3b03..08deae85fda 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -372,3 +372,4 @@ usb-core-fix-race-by-not-overwriting-udev-descriptor-in-hub_port_init.patch usb-core-fix-oversight-in-superspeed-initialization.patch x86-sgx-break-up-long-non-preemptible-delays-in-sgx_vepc_release.patch perf-x86-uncore-correct-the-number-of-chas-on-emr.patch +net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch