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

Commit e42e24c3 authored by Matvejchikov Ilya's avatar Matvejchikov Ilya Committed by David S. Miller
Browse files

tcp: remove redundant argument from tcp_rcv_established() 



The last (4th) argument of tcp_rcv_established() is redundant as it
always equals to skb->len and the skb itself is always passed as 2th
agrument. There is no reason to have it.

Signed-off-by: default avatarIlya V. Matveychikov <matvejchikov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f575a02e

include/net/tcp.h

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

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

			 const struct tcphdr *th, unsigned int len);

			 const struct tcphdr *th);

void tcp_rcv_space_adjust(struct sock *sk);

int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);

void tcp_twsk_destructor(struct sock *sk);

net/ipv4/tcp_input.c

+2 −1
Original line number Diff line number Diff line
@@ -5358,8 +5358,9 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, 
 *	tcp_data_queue when everything is OK.

 */

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

			 const struct tcphdr *th, unsigned int len)

			 const struct tcphdr *th)

{

	unsigned int len = skb->len;

	struct tcp_sock *tp = tcp_sk(sk);



	tcp_mstamp_refresh(tp);

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -1458,7 +1458,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
				sk->sk_rx_dst = NULL;

			}

		}

		tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len);

		tcp_rcv_established(sk, skb, tcp_hdr(skb));

		return 0;

	}

net/ipv4/tcp_probe.c

+3 −2
Original line number Diff line number Diff line
@@ -105,8 +105,9 @@ static inline int tcp_probe_avail(void) 
 * Note: arguments must match tcp_rcv_established()!

 */

static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb,

				 const struct tcphdr *th, unsigned int len)

				 const struct tcphdr *th)

{

	unsigned int len = skb->len;

	const struct tcp_sock *tp = tcp_sk(sk);

	const struct inet_sock *inet = inet_sk(sk);
@@ -145,7 +146,7 @@ static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb, 
				BUG();

			}



			p->length = skb->len;

			p->length = len;

			p->snd_nxt = tp->snd_nxt;

			p->snd_una = tp->snd_una;

			p->snd_cwnd = tp->snd_cwnd;

net/ipv6/tcp_ipv6.c

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

		}



		tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len);

		tcp_rcv_established(sk, skb, tcp_hdr(skb));

		if (opt_skb)

			goto ipv6_pktoptions;

		return 0;