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-udp_ehashfn.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.


>From 74bdfab4fd7c641e55f7fe9d1be9687eeb01df67 Mon Sep 17 00:00:00 2001
From: Lorenz Bauer <lmb@xxxxxxxxxxxxx>
Date: Mon, 31 Jul 2023 11:42:53 +0200
Subject: net: remove duplicate INDIRECT_CALLABLE_DECLARE of udp[6]_ehashfn

From: Lorenz Bauer <lmb@xxxxxxxxxxxxx>

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@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: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 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,


Patches currently in stable-queue which might be from lmb@xxxxxxxxxxxxx are

queue-6.1/net-remove-duplicate-indirect_callable_declare-of-udp_ehashfn.patch
queue-6.1/net-fix-slab-out-of-bounds-in-inet-6-_steal_sock.patch
queue-6.1/net-export-inet_lookup_reuseport-and-inet6_lookup_re.patch
queue-6.1/udp-re-score-reuseport-groups-when-connected-sockets.patch
queue-6.1/bpf-reject-unhashed-sockets-in-bpf_sk_assign.patch
queue-6.1/net-remove-duplicate-reuseport_lookup-functions.patch
queue-6.1/bpf-net-support-so_reuseport-sockets-with-bpf_sk_ass.patch



[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