diff options
| author |   Pengcheng Yang <yangpc@wangsu.com> | 2020-03-16 14:35:07 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-03-16 18:26:54 -0700 |
| commit | be0d935ebfe59130b393bc442e1801e523b43fc6 (patch) | |
| tree | 609ed8d5465d26713fbd34caf928a86e3f288e00 | |
| parent | sfc: fix XDP-redirect in this driver (diff) | |
| download | linux-dev-be0d935ebfe59130b393bc442e1801e523b43fc6.tar.xz linux-dev-be0d935ebfe59130b393bc442e1801e523b43fc6.zip | |
tcp: fix stretch ACK bugs in BIC
Changes BIC to properly handle stretch ACKs in additive
increase mode by passing in the count of ACKed packets
to tcp_cong_avoid_ai().
Signed-off-by: Pengcheng Yang <yangpc@wangsu.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/tcp_bic.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c index 645cc3009e64..f5f588b1f6e9 100644 --- a/net/ipv4/tcp_bic.c +++ b/net/ipv4/tcp_bic.c @@ -145,12 +145,13 @@ static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked) if (!tcp_is_cwnd_limited(sk)) return; - if (tcp_in_slow_start(tp)) - tcp_slow_start(tp, acked); - else { - bictcp_update(ca, tp->snd_cwnd); - tcp_cong_avoid_ai(tp, ca->cnt, 1); + if (tcp_in_slow_start(tp)) { + acked = tcp_slow_start(tp, acked); + if (!acked) + return; } + bictcp_update(ca, tp->snd_cwnd); + tcp_cong_avoid_ai(tp, ca->cnt, acked); } /* |