diff --git a/[refs] b/[refs] index 8b56917878fe..5479bb38f3cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec9c948546a84d0dcee851be1009a8066958e69d +refs/heads/master: 0ec96822d5c0df77107c03b8d9a81a436ab707fc diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h index ef8f9d4dae85..e22b4f0305a3 100644 --- a/trunk/include/net/tcp.h +++ b/trunk/include/net/tcp.h @@ -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; }