diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-20 08:35:34 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-20 08:35:34 -0700 |
| commit | f4150b38acaa292e9efa1e0d82a3d8bdfdbec658 (patch) | |
| tree | 672578a0f65a3315ad6e5354fecbf916fad108db /net/ipv4 | |
| parent | ff05cdd619ab422b5380f56d19603bc51aca97a5 (diff) | |
| parent | d9560919689d588beccf719452086b5cdf6d6c22 (diff) | |
Merge tag 'v4.4.157' into linux-linaro-lsk-v4.4
This is the 4.4.157 stable release
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_minisocks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 4c1c94fa8f08..d270870bf492 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -200,8 +200,9 @@ kill: inet_twsk_deschedule_put(tw); return TCP_TW_SUCCESS; } + } else { + inet_twsk_reschedule(tw, TCP_TIMEWAIT_LEN); } - inet_twsk_reschedule(tw, TCP_TIMEWAIT_LEN); if (tmp_opt.saw_tstamp) { tcptw->tw_ts_recent = tmp_opt.rcv_tsval; |