korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 07:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

tcp: remove redundant argument from tcp_rcv_established()

Browse Source 
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: Ilya V. Matveychikov <matvejchikov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matvejchikov Ilya 2017-07-24 16:02:12 +04:00 committed by David S. Miller
parent f575a02ee7
commit e42e24c3cc
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/tcp.h
View File

@ -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_ioctl(struct sock *sk, int cmd, unsigned long arg);
int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb); int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb);
void tcp_rcv_established(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); void tcp_rcv_space_adjust(struct sock *sk);
int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp); int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);
void tcp_twsk_destructor(struct sock *sk); void tcp_twsk_destructor(struct sock *sk);

3
net/ipv4/tcp_input.c
View File

@ -5358,8 +5358,9 @@ discard:
* tcp_data_queue when everything is OK. * tcp_data_queue when everything is OK.
*/ */
void tcp_rcv_established(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)
{ {
unsigned int len = skb->len;
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
tcp_mstamp_refresh(tp); tcp_mstamp_refresh(tp);

2
net/ipv4/tcp_ipv4.c
View File

@ -1458,7 +1458,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
sk->sk_rx_dst = NULL; 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; return 0;
} }

5
net/ipv4/tcp_probe.c
View File

@ -105,8 +105,9 @@ static inline int tcp_probe_avail(void)
* Note: arguments must match tcp_rcv_established()! * Note: arguments must match tcp_rcv_established()!
*/ */
static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb, 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 tcp_sock *tp = tcp_sk(sk);
const struct inet_sock *inet = inet_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(); BUG();
} }
p->length = skb->len; p->length = len;
p->snd_nxt = tp->snd_nxt; p->snd_nxt = tp->snd_nxt;
p->snd_una = tp->snd_una; p->snd_una = tp->snd_una;
p->snd_cwnd = tp->snd_cwnd; p->snd_cwnd = tp->snd_cwnd;

2
net/ipv6/tcp_ipv6.c
View File

@ -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) if (opt_skb)
goto ipv6_pktoptions; goto ipv6_pktoptions;
return 0; return 0;