6.1-stable patches

added patches:
	net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch

diff --git a/queue-6.1/net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch b/queue-6.1/net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch
new file mode 100644 (file)
index 0000000..e9b0430
--- /dev/null
+++ b/queue-6.1/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 <lmb@isovalent.com>
+Date: Mon, 31 Jul 2023 11:42:53 +0200
+Subject: net: remove duplicate INDIRECT_CALLABLE_DECLARE of udp[6]_ehashfn
+
+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.com
+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,

diff --git a/queue-6.1/series b/queue-6.1/series
index 729321c777d6f780ff1959b5193582d4448e3002..5ba0260d69d8719fbbd512670d5ff788784bb99c 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -588,3 +588,4 @@ x86-sgx-break-up-long-non-preemptible-delays-in-sgx_vepc_release.patch
 perf-x86-uncore-correct-the-number-of-chas-on-emr.patch
 serial-sc16is7xx-remove-obsolete-out_thread-label.patch
 serial-sc16is7xx-fix-regression-with-gpio-configurat.patch
+net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch