This causes build failure.
Keep all parts of the function from v5.10/standard/base
Fixes: f640c7dd08c9 ("Merge branch 'v5.10/standard/base' into
v5.10/standard/preempt-rt/base")
Signed-off-by: He Zhe <[email protected]>
---
net/ipv4/inet_hashtables.c | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 51c7d734175f..915b8e1bd9ef 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -680,26 +680,9 @@ EXPORT_SYMBOL_GPL(inet_hash);
static void __inet_unhash(struct sock *sk, struct inet_listen_hashbucket *ilb)
{
- struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
- struct inet_listen_hashbucket *ilb = NULL;
- spinlock_t *lock;
- bool state_listen;
-
if (sk_unhashed(sk))
return;
- if (sk->sk_state == TCP_LISTEN) {
- state_listen = true;
- ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
- spin_lock(&ilb->lock);
- } else {
- state_listen = false;
- lock = inet_ehash_lockp(hashinfo, sk->sk_hash);
- spin_lock_bh(lock);
- }
- if (sk_unhashed(sk))
- goto unlock;
-
if (rcu_access_pointer(sk->sk_reuseport_cb))
reuseport_detach_sock(sk);
if (ilb) {
@@ -710,11 +693,6 @@ static void __inet_unhash(struct sock *sk, struct
inet_listen_hashbucket *ilb)
}
__sk_nulls_del_node_init_rcu(sk);
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
-unlock:
- if (state_listen)
- spin_unlock(&ilb->lock);
- else
- spin_unlock_bh(lock);
}
void inet_unhash(struct sock *sk)
--
2.32.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11245):
https://lists.yoctoproject.org/g/linux-yocto/message/11245
Mute This Topic: https://lists.yoctoproject.org/mt/90680941/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
