From bb921c80386b997b9f4985a9ee0fd662814c1ea3 Mon Sep 17 00:00:00 2001 From: John Heffner Date: Mon, 5 Feb 2007 17:53:11 -0800 Subject: [PATCH] --- yaml --- r: 46941 b: refs/heads/master c: 104439a8876a98eac1b6593907a3c7bc51e362fe h: refs/heads/master i: 46939: eb226f619a8b08ce14e85fc0424ad105813837bc v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_output.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b37f44fc8686..820338c369aa 100644 --- 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 index 975f4472af29..58b7111523f4 100644 --- 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);