---

yaml --- r: 53469 b: refs/heads/master c: 0ec9682 h: refs/heads/master i: 53467: 2e5d37b v: v3
git-mirror · May 3, 2007 · 0799cd2 · 0799cd2
1 parent fe1579c
commit 0799cd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 }