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

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

tcp: remove tcp_rcv_state_process() tcp_hdr argument 



Factorize code to get tcp header from skb. It makes no sense
to duplicate code in callers.

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

include/net/tcp.h

+1 −2
Original line number Diff line number Diff line
@@ -365,8 +365,7 @@ void tcp_wfree(struct sk_buff *skb); 
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);

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

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

+2 −2
Original line number Diff line number Diff line
@@ -5698,11 +5698,11 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 
 *	address independent.

 */



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

			  const struct tcphdr *th)

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

{

	struct tcp_sock *tp = tcp_sk(sk);

	struct inet_connection_sock *icsk = inet_csk(sk);

	const struct tcphdr *th = tcp_hdr(skb);

	struct request_sock *req;

	int queued = 0;

	bool acceptable;

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))) {

	if (tcp_rcv_state_process(sk, skb)) {

		rsk = sk;

		goto reset;

	}

net/ipv4/tcp_minisocks.c

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

		ret = tcp_rcv_state_process(child, 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)))

	if (tcp_rcv_state_process(sk, skb))

		goto reset;

	if (opt_skb)

		goto ipv6_pktoptions;