Commit a05a7280 authored by Pengcheng Yang's avatar Pengcheng Yang Committed by Jakub Kicinski
Browse files

tcp: remove unused ICSK_TIME_EARLY_RETRANS 



Since the early retransmit has been removed by
commit bec41a11 ("tcp: remove early retransmit"),
we also remove the unused ICSK_TIME_EARLY_RETRANS macro.

Signed-off-by: default avatarPengcheng Yang <yangpc@wangsu.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/1611239473-27304-1-git-send-email-yangpc@wangsu.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2d8983f9

include/net/inet_connection_sock.h

+1 −3
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ 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 */
@@ -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);