* [PATCH net-next] tcp: remove unused ICSK_TIME_EARLY_RETRANS
@ 2021-01-21 14:31 Pengcheng Yang
2021-01-21 15:32 ` Eric Dumazet
0 siblings, 1 reply; 3+ messages in thread
From: Pengcheng Yang @ 2021-01-21 14:31 UTC (permalink / raw)
To: edumazet, ycheng, ncardwell, davem; +Cc: netdev, Pengcheng Yang
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(-)
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);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] tcp: remove unused ICSK_TIME_EARLY_RETRANS
2021-01-21 14:31 [PATCH net-next] tcp: remove unused ICSK_TIME_EARLY_RETRANS Pengcheng Yang
@ 2021-01-21 15:32 ` Eric Dumazet
2021-01-23 2:10 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Eric Dumazet @ 2021-01-21 15:32 UTC (permalink / raw)
To: Pengcheng Yang; +Cc: Yuchung Cheng, Neal Cardwell, David Miller, netdev
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>
> ---
SGTM, thanks.
Signed-off-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] tcp: remove unused ICSK_TIME_EARLY_RETRANS
2021-01-21 15:32 ` Eric Dumazet
@ 2021-01-23 2:10 ` Jakub Kicinski
0 siblings, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2021-01-23 2:10 UTC (permalink / raw)
To: Eric Dumazet, Pengcheng Yang
Cc: Yuchung Cheng, Neal Cardwell, David Miller, netdev
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-23 2:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-21 14:31 [PATCH net-next] tcp: remove unused ICSK_TIME_EARLY_RETRANS Pengcheng Yang
2021-01-21 15:32 ` Eric Dumazet
2021-01-23 2:10 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.