| Message ID | 1611239473-27304-1-git-send-email-yangpc@wangsu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] tcp: remove unused ICSK_TIME_EARLY_RETRANS | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: kuba@kernel.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 3606 this patch: 3606 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 4030 this patch: 4030 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
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>
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 --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);
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(-)