After commit bec41a11dd3d ("tcp: remove early retransmit")
ICSK_TIME_EARLY_RETRANS is no longer effective, so we can remove
its definition too.
Cc: Yuchung Cheng <ych...@google.com>
Cc: Eric Dumazet <eduma...@google.com>
Signed-off-by: Cong Wang <xiyou.wangc...@gmail.com>
---
include/net/inet_connection_sock.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/net/inet_connection_sock.h
b/include/net/inet_connection_sock.h
index 895546058a20..e46958460739 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -142,9 +142,8 @@ struct inet_connection_sock {
#define ICSK_TIME_RETRANS 1 /* Retransmit timer */
#define ICSK_TIME_DACK 2 /* Delayed ack timer */
#define ICSK_TIME_PROBE0 3 /* Zero window probe timer */
-#define ICSK_TIME_EARLY_RETRANS 4 /* Early retransmit timer */
-#define ICSK_TIME_LOSS_PROBE 5 /* Tail loss probe timer */
-#define ICSK_TIME_REO_TIMEOUT 6 /* Reordering timer */
+#define ICSK_TIME_LOSS_PROBE 4 /* Tail loss probe timer */
+#define ICSK_TIME_REO_TIMEOUT 5 /* Reordering timer */
static inline struct inet_connection_sock *inet_csk(const struct sock *sk)
{
@@ -227,8 +226,7 @@ static inline void inet_csk_reset_xmit_timer(struct sock
*sk, const int what,
}
if (what == ICSK_TIME_RETRANS || what == ICSK_TIME_PROBE0 ||
- what == ICSK_TIME_EARLY_RETRANS || what == ICSK_TIME_LOSS_PROBE ||
- what == ICSK_TIME_REO_TIMEOUT) {
+ what == ICSK_TIME_LOSS_PROBE || what == ICSK_TIME_REO_TIMEOUT) {
icsk->icsk_pending = what;
icsk->icsk_timeout = jiffies + when;
sk_reset_timer(sk, &icsk->icsk_retransmit_timer,
icsk->icsk_timeout);
--
2.21.0
