---

yaml --- r: 46941 b: refs/heads/master c: 104439a h: refs/heads/master i: 46939: eb226f6 v: v3
git-mirror · Feb 8, 2007 · bb921c8 · bb921c8
1 parent 134fb5a
commit bb921c8
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: 8a3c3a972741dec77220a19642bd3331551ad2d9
+refs/heads/master: 104439a8876a98eac1b6593907a3c7bc51e362fe
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
@@ -965,7 +965,8 @@ static inline unsigned int tcp_cwnd_test(struct tcp_sock *tp, struct sk_buff *sk
 	u32 in_flight, cwnd;
 
 	/* Don't be strict about the congestion window for the final FIN.  */
-	if (TCP_SKB_CB(skb)->flags & TCPCB_FLAG_FIN)
+	if ((TCP_SKB_CB(skb)->flags & TCPCB_FLAG_FIN) &&
+	    tcp_skb_pcount(skb) == 1)
 		return 1;
 
 	in_flight = tcp_packets_in_flight(tp);