summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Heffner <jheffner@napa.none>2008-04-25 01:43:57 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-01 14:49:01 -0700
commit085b9f23e255e984b771660eca2aa737f72dbc00 (patch)
tree2caafca506fd648659e2f1a5db71d2f2d2c08b6a
parentc3648f834964ad96b9f567776088ebb28f241172 (diff)
Increase the max_burst threshold from 3 to tp->reordering.
[ Upstream commit: dd9e0dda66ba38a2ddd1405ac279894260dc5c36 ] This change is necessary to allow cwnd to grow during persistent reordering. Cwnd moderation is applied when in the disorder state and an ack that fills the hole comes in. If the hole was greater than 3 packets, but less than tp->reordering, cwnd will shrink when it should not have. Signed-off-by: John Heffner <jheffner@napa.none> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--include/net/tcp.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index cb5b033e0e59..fbc4959a2482 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -775,11 +775,14 @@ extern void tcp_enter_cwr(struct sock *sk, const int set_ssthresh);
extern __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst);
/* Slow start with delack produces 3 packets of burst, so that
- * it is safe "de facto".
+ * it is safe "de facto". This will be the default - same as
+ * the default reordering threshold - but if reordering increases,
+ * we must be able to allow cwnd to burst at least this much in order
+ * to not pull it back when holes are filled.
*/
static __inline__ __u32 tcp_max_burst(const struct tcp_sock *tp)
{
- return 3;
+ return tp->reordering;
}
/* RFC2861 Check whether we are limited by application or congestion window