Commit d25f3272 authored by Jason Xing's avatar Jason Xing Committed by Paolo Abeni
Browse files

tcp: no need to use acceptable for conn_request 

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarJason Xing <kernelxing@tencent.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20240213131205.4309-1-kerneljasonxing@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 3be0d950

net/ipv4/tcp_input.c

+1 −4
Original line number Diff line number Diff line
@@ -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;

		}