diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-08-09 07:45:17 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:47:57 -0400 |
commit | 86426c22d24e0c904012711a14cb5021f4a167dc (patch) | |
tree | 7f91ac32273e0b1b568a704dbde5b360bc94f65f /net/ipv4 | |
parent | 005903bc3a0e8473fef809e8775db52dcd3cde63 (diff) |
[TCP]: Restore over-zealous tcp_sync_left_out-like removals
tcp_verify_left_out is useful for verifying S+L condition, so
add it back to couple of places in where the code was not
calling to tcp_sync_left_out but used own ad-hoc solution
(before the tcp_sync_left_out got removed).
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index b11bd1624227..93823b83522b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -1346,6 +1346,8 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ | |||
1346 | } | 1346 | } |
1347 | } | 1347 | } |
1348 | 1348 | ||
1349 | tcp_verify_left_out(tp); | ||
1350 | |||
1349 | if ((reord < tp->fackets_out) && icsk->icsk_ca_state != TCP_CA_Loss && | 1351 | if ((reord < tp->fackets_out) && icsk->icsk_ca_state != TCP_CA_Loss && |
1350 | (!tp->frto_highmark || after(tp->snd_una, tp->frto_highmark))) | 1352 | (!tp->frto_highmark || after(tp->snd_una, tp->frto_highmark))) |
1351 | tcp_update_reordering(sk, ((tp->fackets_out + 1) - reord), 0); | 1353 | tcp_update_reordering(sk, ((tp->fackets_out + 1) - reord), 0); |
@@ -2121,6 +2123,8 @@ static void tcp_try_to_open(struct sock *sk, int flag) | |||
2121 | { | 2123 | { |
2122 | struct tcp_sock *tp = tcp_sk(sk); | 2124 | struct tcp_sock *tp = tcp_sk(sk); |
2123 | 2125 | ||
2126 | tcp_verify_left_out(tp); | ||
2127 | |||
2124 | if (tp->retrans_out == 0) | 2128 | if (tp->retrans_out == 0) |
2125 | tp->retrans_stamp = 0; | 2129 | tp->retrans_stamp = 0; |
2126 | 2130 | ||