diff options
author | Yuchung Cheng <ycheng@google.com> | 2018-07-12 09:04:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-13 21:30:19 -0400 |
commit | a69258f7aa2623e0930212f09c586fd06674ad79 (patch) | |
tree | e2c8dcd7afb92e790d652b6d096cafe837946faa /net/ipv4/tcp_output.c | |
parent | b0c05d0e99d98d7f0cd41efc1eeec94efdc3325d (diff) |
tcp: remove DELAYED ACK events in DCTCP
After fixing the way DCTCP tracking delayed ACKs, the delayed-ACK
related callbacks are no longer needed
Signed-off-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Lawrence Brakmo <brakmo@fb.com>
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) | |||
3523 | int ato = icsk->icsk_ack.ato; | 3523 | int ato = icsk->icsk_ack.ato; |
3524 | unsigned long timeout; | 3524 | unsigned long timeout; |
3525 | 3525 | ||
3526 | tcp_ca_event(sk, CA_EVENT_DELAYED_ACK); | ||
3527 | |||
3528 | if (ato > TCP_DELACK_MIN) { | 3526 | if (ato > TCP_DELACK_MIN) { |
3529 | const struct tcp_sock *tp = tcp_sk(sk); | 3527 | const struct tcp_sock *tp = tcp_sk(sk); |
3530 | int max_ato = HZ / 2; | 3528 | int max_ato = HZ / 2; |
@@ -3581,8 +3579,6 @@ void tcp_send_ack(struct sock *sk) | |||
3581 | if (sk->sk_state == TCP_CLOSE) | 3579 | if (sk->sk_state == TCP_CLOSE) |
3582 | return; | 3580 | return; |
3583 | 3581 | ||
3584 | tcp_ca_event(sk, CA_EVENT_NON_DELAYED_ACK); | ||
3585 | |||
3586 | /* We are not putting this on the write queue, so | 3582 | /* We are not putting this on the write queue, so |
3587 | * tcp_transmit_skb() will set the ownership to this | 3583 | * tcp_transmit_skb() will set the ownership to this |
3588 | * sock. | 3584 | * sock. |