Skip to content

Commit

Permalink
tcp: move rx_opt & syn_data_acked init to tcp_disconnect()
Browse files Browse the repository at this point in the history
If we make sure all listeners have these fields cleared, then a clone
will also inherit zero values.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Jan 18, 2019
1 parent 792c435 commit 6bcdc40
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 4 additions & 0 deletions net/ipv4/tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2617,6 +2617,10 @@ int tcp_disconnect(struct sock *sk, int flags)
tp->rack.last_delivered = 0;
tp->rack.reo_wnd_persist = 0;
tp->rack.dsack_seen = 0;
tp->syn_data_acked = 0;
tp->rx_opt.saw_tstamp = 0;
tp->rx_opt.dsack = 0;
tp->rx_opt.num_sacks = 0;


/* Clean up fastopen related fields */
Expand Down
6 changes: 0 additions & 6 deletions net/ipv4/tcp_minisocks.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,11 +489,6 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,
tcp_init_xmit_timers(newsk);
newtp->write_seq = newtp->pushed_seq = treq->snt_isn + 1;

newtp->rx_opt.saw_tstamp = 0;

newtp->rx_opt.dsack = 0;
newtp->rx_opt.num_sacks = 0;

if (sock_flag(newsk, SOCK_KEEPOPEN))
inet_csk_reset_keepalive_timer(newsk,
keepalive_time_when(newtp));
Expand Down Expand Up @@ -534,7 +529,6 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,
tcp_ecn_openreq_child(newtp, req);
newtp->fastopen_req = NULL;
newtp->fastopen_rsk = NULL;
newtp->syn_data_acked = 0;

__TCP_INC_STATS(sock_net(sk), TCP_MIB_PASSIVEOPENS);

Expand Down

0 comments on commit 6bcdc40

Please sign in to comment.