Patch "net: remove duplicate INDIRECT_CALLABLE_DECLARE of udp[6]_ehashfn" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    net: remove duplicate INDIRECT_CALLABLE_DECLARE of udp[6]_ehashfn

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-remove-duplicate-indirect_callable_declare-of-ud.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 705cf0b6e62db66c305aed4ace87fcca929473f7
Author: Lorenz Bauer <lmb@xxxxxxxxxxxxx>
Date:   Mon Jul 31 11:42:53 2023 +0200

    net: remove duplicate INDIRECT_CALLABLE_DECLARE of udp[6]_ehashfn
    
    [ Upstream commit 74bdfab4fd7c641e55f7fe9d1be9687eeb01df67 ]
    
    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@xxxxxxxxx>
    Signed-off-by: Lorenz Bauer <lmb@xxxxxxxxxxxxx>
    Reviewed-by: Kuniyuki Iwashima <kuniyu@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230731-indir-call-v1-1-4cd0aeaee64f@xxxxxxxxxxxxx
    Signed-off-by: Martin KaFai Lau <martin.lau@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 6204f690d6c50..732a31a54fe2e 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -339,8 +339,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 f76dbbb293329..abf0d127994fe 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.




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux