iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: remove unused len argument from tcp_rcv_state_process()

Browse Source 
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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2015-09-29 07:42:40 -07:00 committed by David S. Miller
parent a00e74442b
commit bda07a64c0
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/tcp.h
View File

@ -366,7 +366,7 @@ void tcp_write_timer_handler(struct sock *sk);
void tcp_delack_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_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,
const struct tcphdr *th, unsigned int len); const struct tcphdr *th);
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);
void tcp_rcv_space_adjust(struct sock *sk); void tcp_rcv_space_adjust(struct sock *sk);

6
net/ipv4/tcp_input.c
View File

@ -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, 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 inet_connection_sock *icsk = inet_csk(sk);
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
@ -5699,7 +5699,7 @@ reset_and_undo:
*/ */
int tcp_rcv_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 tcp_sock *tp = tcp_sk(sk);
struct inet_connection_sock *icsk = inet_csk(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; goto discard;
case TCP_SYN_SENT: 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) if (queued >= 0)
return queued; return queued;

2
net/ipv4/tcp_ipv4.c
View File

@ -1420,7 +1420,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
} else } else
sock_rps_save_rxhash(sk, skb); 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; rsk = sk;
goto reset; goto reset;
} }

3
net/ipv4/tcp_minisocks.c
View File

@ -821,8 +821,7 @@ int tcp_child_process(struct sock *parent, struct sock *child,
int state = child->sk_state; int state = child->sk_state;
if (!sock_owned_by_user(child)) { if (!sock_owned_by_user(child)) {
ret = tcp_rcv_state_process(child, skb, tcp_hdr(skb), ret = tcp_rcv_state_process(child, skb, tcp_hdr(skb));
skb->len);
/* Wakeup parent, send SIGIO */ /* Wakeup parent, send SIGIO */
if (state == TCP_SYN_RECV && child->sk_state != state) if (state == TCP_SYN_RECV && child->sk_state != state)
parent->sk_data_ready(parent); parent->sk_data_ready(parent);

2
net/ipv6/tcp_ipv6.c
View File

@ -1272,7 +1272,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
} else } else
sock_rps_save_rxhash(sk, skb); 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; goto reset;
if (opt_skb) if (opt_skb)
goto ipv6_pktoptions; goto ipv6_pktoptions;