[TCP]: Use S+L catcher only with SACK for now
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Thu, 3 May 2007 10:30:34 +0000 (03:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 May 2007 10:30:34 +0000 (03:30 -0700)
TCP has a transitional state when SACK is not in use during
which this invariant is temporarily broken. Without SACK,
tcp_clean_rtx_queue does not decrement sacked_out. Therefore
calls to tcp_sync_left_out before sacked_out is again
corrected by tcp_fastretrans_alert can trigger this trap as
sacked_out still has couple of segments that are already out
of window.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/tcp.h

index ef8f9d4dae8501459ce9a9f4fb38dff5407d3945..e22b4f0305a339ce402b1e959ee0a64665fe2b1e 100644 (file)
@@ -736,7 +736,8 @@ static inline __u32 tcp_current_ssthresh(const struct sock *sk)
 
 static inline void tcp_sync_left_out(struct tcp_sock *tp)
 {
-       BUG_ON(tp->sacked_out + tp->lost_out > tp->packets_out);
+       BUG_ON(tp->rx_opt.sack_ok &&
+              (tp->sacked_out + tp->lost_out > tp->packets_out));
        tp->left_out = tp->sacked_out + tp->lost_out;
 }