diff mbox series

[net-next] tcp: remove unused ICSK_TIME_EARLY_RETRANS

Message ID 1611239473-27304-1-git-send-email-yangpc@wangsu.com
State New
Headers show
Series [net-next] tcp: remove unused ICSK_TIME_EARLY_RETRANS | expand

Commit Message

Pengcheng Yang Jan. 21, 2021, 2:31 p.m. UTC 
Since the early retransmit has been removed by
commit bec41a11dd3d ("tcp: remove early retransmit"),
we also remove the unused ICSK_TIME_EARLY_RETRANS macro.

Signed-off-by: Pengcheng Yang <yangpc@wangsu.com>
---
 include/net/inet_connection_sock.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Jakub Kicinski Jan. 23, 2021, 2:10 a.m. UTC | #1 
On Thu, 21 Jan 2021 16:32:36 +0100 Eric Dumazet wrote:
> On Thu, Jan 21, 2021 at 3:32 PM Pengcheng Yang <yangpc@wangsu.com> wrote:

> >

> > Since the early retransmit has been removed by

> > commit bec41a11dd3d ("tcp: remove early retransmit"),

> > we also remove the unused ICSK_TIME_EARLY_RETRANS macro.

> >

> > Signed-off-by: Pengcheng Yang <yangpc@wangsu.com>

>

> Signed-off-by: Eric Dumazet <edumazet@google.com>


Applied, thank you!
diff mbox series

Patch

diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 7338b38..e9490ef 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -138,7 +138,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 */
 
@@ -224,8 +223,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);