Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=52d3408150858a301a84bcbfe2f323d90d71d2ce
Commit:     52d3408150858a301a84bcbfe2f323d90d71d2ce
Parent:     3e6f049e0c4cf0606207c1a210abf50b436e9adf
Author:     Ilpo J�rvinen <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 5 02:21:35 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Dec 5 05:37:30 2007 -0800

    [TCP]: Move prior_in_flight collect to more robust place
    
    The previous location is after sacktag processing, which affects
    counters tcp_packets_in_flight depends on. This may manifest as
    wrong behavior if new SACK blocks are present and all is clear
    for call to tcp_cong_avoid, which in the case of
    tcp_reno_cong_avoid bails out early because it thinks that
    TCP is not limited by cwnd.
    
    Signed-off-by: Ilpo J�rvinen <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv4/tcp_input.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 094f8fa..b9e429d 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3065,6 +3065,7 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, 
int flag)
        }
 
        prior_fackets = tp->fackets_out;
+       prior_in_flight = tcp_packets_in_flight(tp);
 
        if (!(flag&FLAG_SLOWPATH) && after(ack, prior_snd_una)) {
                /* Window is constant, pure forward advance.
@@ -3104,8 +3105,6 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, 
int flag)
        if (!prior_packets)
                goto no_queue;
 
-       prior_in_flight = tcp_packets_in_flight(tp);
-
        /* See if we can take anything off of the retransmit queue. */
        flag |= tcp_clean_rtx_queue(sk, &seq_rtt, prior_fackets);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to