diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-14 03:30:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-14 03:30:19 +0200 |
| commit | 6bed5e260709897cf918ca262b8e68a17227ec4b (patch) | |
| tree | e2c8dcd7afb92e790d652b6d096cafe837946faa /net/ipv4/tcp_output.c | |
| parent | qlogic: check kstrtoul() for errors (diff) | |
| parent | tcp: remove DELAYED ACK events in DCTCP (diff) | |
| download | linux-6bed5e260709897cf918ca262b8e68a17227ec4b.tar.xz linux-6bed5e260709897cf918ca262b8e68a17227ec4b.zip | |
Merge branch 'fix-DCTCP-delayed-ACK'
Yuchung Cheng says:
====================
fix DCTCP delayed ACK
This patch series addresses the issue that sometimes DCTCP
fail to acknowledge the latest sequence and result in sender timeout
if inflight is small.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 8e08b409c71e..00e5a300ddb9 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3523,8 +3523,6 @@ void tcp_send_delayed_ack(struct sock *sk) int ato = icsk->icsk_ack.ato; unsigned long timeout; - tcp_ca_event(sk, CA_EVENT_DELAYED_ACK); - if (ato > TCP_DELACK_MIN) { const struct tcp_sock *tp = tcp_sk(sk); int max_ato = HZ / 2; @@ -3581,8 +3579,6 @@ void tcp_send_ack(struct sock *sk) if (sk->sk_state == TCP_CLOSE) return; - tcp_ca_event(sk, CA_EVENT_NON_DELAYED_ACK); - /* We are not putting this on the write queue, so * tcp_transmit_skb() will set the ownership to this * sock. |