aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuchung Cheng <ycheng@google.com>2016-02-02 10:33:08 -0800
committerDavid S. Miller <davem@davemloft.net>2016-02-07 14:09:51 -0500
commit2d14a4def4fc87cb2d2712f7841b45189d75e301 (patch)
tree8e5f7990136533c684af4243a2da66a233f72721
parenttcp: refactor pkts acked accounting (diff)
downloadlinux-dev-2d14a4def4fc87cb2d2712f7841b45189d75e301.tar.xz
linux-dev-2d14a4def4fc87cb2d2712f7841b45189d75e301.zip
tcp: make congestion control more robust against reordering
This change enables congestion control to update cwnd based on not only packet cumulatively acked but also packets delivered out-of-order. This makes congestion control robust against packet reordering because it may raise cwnd as long as packets are being delivered once reordering has been detected (i.e., it only cares the amount of packets delivered, not the ordering among them). Signed-off-by: Yuchung Cheng <ycheng@google.com> Signed-off-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: Eric Dumazet <ncardwell@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 40824b380ef8..d598ff408cb9 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3660,7 +3660,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
tcp_cwnd_reduction(sk, acked_sacked, flag);
} else if (tcp_may_raise_cwnd(sk, flag)) {
/* Advance cwnd if state allows */
- tcp_cong_avoid(sk, ack, acked);
+ tcp_cong_avoid(sk, ack, acked_sacked);
}
if ((flag & FLAG_FORWARD_PROGRESS) || !(flag & FLAG_NOT_DUP)) {