Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda07a64 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: remove unused len argument from tcp_rcv_state_process() 



Once we realize tcp_rcv_synsent_state_process() does not use
its 'len' argument and we get rid of it, then it becomes clear
this argument is no longer used in tcp_rcv_state_process()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a00e7444

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ void tcp_write_timer_handler(struct sock *sk); 
void tcp_delack_timer_handler(struct sock *sk);

int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg);

int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,

			  const struct tcphdr *th, unsigned int len);

			  const struct tcphdr *th);

void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,

			 const struct tcphdr *th, unsigned int len);

void tcp_rcv_space_adjust(struct sock *sk);

net/ipv4/tcp_input.c

+3 −3
Original line number Diff line number Diff line
@@ -5472,7 +5472,7 @@ static bool tcp_rcv_fastopen_synack(struct sock *sk, struct sk_buff *synack, 
}



static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,

					 const struct tcphdr *th, unsigned int len)

					 const struct tcphdr *th)

{

	struct inet_connection_sock *icsk = inet_csk(sk);

	struct tcp_sock *tp = tcp_sk(sk);
@@ -5699,7 +5699,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 
 */



int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,

			  const struct tcphdr *th, unsigned int len)

			  const struct tcphdr *th)

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct inet_connection_sock *icsk = inet_csk(sk);
@@ -5749,7 +5749,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 
		goto discard;



	case TCP_SYN_SENT:

		queued = tcp_rcv_synsent_state_process(sk, skb, th, len);

		queued = tcp_rcv_synsent_state_process(sk, skb, th);

		if (queued >= 0)

			return queued;

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -1420,7 +1420,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
	} else

		sock_rps_save_rxhash(sk, skb);



	if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len)) {

	if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb))) {

		rsk = sk;

		goto reset;

	}

net/ipv4/tcp_minisocks.c

+1 −2
Original line number Diff line number Diff line
@@ -821,8 +821,7 @@ int tcp_child_process(struct sock *parent, struct sock *child, 
	int state = child->sk_state;



	if (!sock_owned_by_user(child)) {

		ret = tcp_rcv_state_process(child, skb, tcp_hdr(skb),

					    skb->len);

		ret = tcp_rcv_state_process(child, skb, tcp_hdr(skb));

		/* Wakeup parent, send SIGIO */

		if (state == TCP_SYN_RECV && child->sk_state != state)

			parent->sk_data_ready(parent);

net/ipv6/tcp_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
	} else

		sock_rps_save_rxhash(sk, skb);



	if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len))

	if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb)))

		goto reset;

	if (opt_skb)

		goto ipv6_pktoptions;