projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3be0d95
)
tcp: no need to use acceptable for conn_request
author
Jason Xing
<kernelxing@tencent.com>
Tue, 13 Feb 2024 13:12:05 +0000
(21:12 +0800)
committer
Paolo Abeni
<pabeni@redhat.com>
Thu, 15 Feb 2024 11:57:11 +0000
(12:57 +0100)
Since tcp_conn_request() always returns zero, there is no need to
keep the dead code. Remove it then.
Link:
https://lore.kernel.org/netdev/CANn89iJwx9b2dUGUKFSV3PF=kN5o+kxz3A_fHZZsOS4AnXhBNw@mail.gmail.com/
Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jason Xing <kernelxing@tencent.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link:
https://lore.kernel.org/r/20240213131205.4309-1-kerneljasonxing@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/ipv4/tcp_input.c
patch
|
blob
|
history
diff --git
a/net/ipv4/tcp_input.c
b/net/ipv4/tcp_input.c
index
2d20edf
..
b1c4462
100644
(file)
--- a/
net/ipv4/tcp_input.c
+++ b/
net/ipv4/tcp_input.c
@@
-6623,7
+6623,6
@@
int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)
const struct tcphdr *th = tcp_hdr(skb);
struct request_sock *req;
int queued = 0;
- bool acceptable;
SKB_DR(reason);
switch (sk->sk_state) {
@@
-6649,12
+6648,10
@@
int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)
*/
rcu_read_lock();
local_bh_disable();
-
acceptable = icsk->icsk_af_ops->conn_request(sk, skb) >= 0
;
+
icsk->icsk_af_ops->conn_request(sk, skb)
;
local_bh_enable();
rcu_read_unlock();
- if (!acceptable)
- return 1;
consume_skb(skb);
return 0;
}