projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'staging-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
tcp_cubic.c
diff --git
a/net/ipv4/tcp_cubic.c
b/net/ipv4/tcp_cubic.c
index 4b276d1ed9807057986bd3b050e2e901bf1afec0..06d3d665a9fd1bfda5688907a284de83697273f6 100644
(file)
--- a/
net/ipv4/tcp_cubic.c
+++ b/
net/ipv4/tcp_cubic.c
@@
-306,8
+306,10
@@
tcp_friendliness:
}
}
}
}
- if (ca->cnt == 0) /* cannot be zero */
- ca->cnt = 1;
+ /* The maximum rate of cwnd increase CUBIC allows is 1 packet per
+ * 2 packets ACKed, meaning cwnd grows at 1.5x per RTT.
+ */
+ ca->cnt = max(ca->cnt, 2U);
}
static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)
}
static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)