OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16...
[uclinux-h8/linux.git]
/
net
/
ipv4
/
tcp_cubic.c
diff --git
a/net/ipv4/tcp_cubic.c
b/net/ipv4/tcp_cubic.c
index
8bf2245
..
b4f1b29
100644
(file)
--- a/
net/ipv4/tcp_cubic.c
+++ b/
net/ipv4/tcp_cubic.c
@@
-409,7
+409,7
@@
static void bictcp_acked(struct sock *sk, u32 cnt, s32 rtt_us)
ratio -= ca->delayed_ack >> ACK_RATIO_SHIFT;
ratio += cnt;
- ca->delayed_ack =
min(ratio
, ACK_RATIO_LIMIT);
+ ca->delayed_ack =
clamp(ratio, 1U
, ACK_RATIO_LIMIT);
}
/* Some calls are for duplicates without timetamps */