Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e1c3e7ab6de9711d2e0e9daf369c6638582eb7e7
Commit:     e1c3e7ab6de9711d2e0e9daf369c6638582eb7e7
Parent:     9af3912ec9e30509b76cb376abb65a4d8af27df3
Author:     Stephen Hemminger <[EMAIL PROTECTED]>
AuthorDate: Sat Mar 24 21:34:38 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:28:09 2007 -0700

    [TCP]: cubic update for net-2.6.22
    
    The following update received from Injong updates TCP cubic to the latest
    version. I am running more complete tests and will have results after 4/1.
    
    According to Injong: the new version improves on its scalability,
    fairness and stability.  So in all properties, we confirmed it shows better
    performance.
    
    NCSU results (for 2.6.18 and 2.6.20) available:
        http://netsrv.csc.ncsu.edu/wiki/index.php/TCP_Testing
    
    This version is described in a new Internet draft for CUBIC.
        http://www.ietf.org/internet-drafts/draft-rhee-tcp-cubic-00.txt
    
    Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv4/tcp_cubic.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
index 15c5803..296845b 100644
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c
@@ -1,5 +1,5 @@
 /*
- * TCP CUBIC: Binary Increase Congestion control for TCP v2.0
+ * TCP CUBIC: Binary Increase Congestion control for TCP v2.1
  *
  * This is from the implementation of CUBIC TCP in
  * Injong Rhee, Lisong Xu.
@@ -214,7 +214,9 @@ static inline void bictcp_update(struct bictcp *ca, u32 
cwnd)
        if (ca->delay_min > 0) {
                /* max increment = Smax * rtt / 0.1  */
                min_cnt = (cwnd * HZ * 8)/(10 * max_increment * ca->delay_min);
-               if (ca->cnt < min_cnt)
+
+               /* use concave growth when the target is above the origin */
+               if (ca->cnt < min_cnt && t >= ca->bic_K)
                        ca->cnt = min_cnt;
        }
 
@@ -400,4 +402,4 @@ module_exit(cubictcp_unregister);
 MODULE_AUTHOR("Sangtae Ha, Stephen Hemminger");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("CUBIC TCP");
-MODULE_VERSION("2.0");
+MODULE_VERSION("2.1");
-
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