* [PATCH] net-tcp: remove useless tw_timeout field
@ 2018-06-05 10:07 Maciej Żenczykowski
2018-06-05 12:59 ` Eric Dumazet
0 siblings, 1 reply; 3+ messages in thread
From: Maciej Żenczykowski @ 2018-06-05 10:07 UTC (permalink / raw)
To: Maciej Żenczykowski, David S . Miller, Eric Dumazet; +Cc: netdev
From: Maciej Żenczykowski <maze@google.com>
Tested: 'git grep tw_timeout' comes up empty and it builds :-)
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Cc: Eric Dumazet <edumazet@google.com>
---
include/net/inet_timewait_sock.h | 1 -
net/dccp/minisocks.c | 1 -
net/ipv4/tcp_minisocks.c | 1 -
3 files changed, 3 deletions(-)
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 659d8ed5a3bc..78775038f011 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -61,7 +61,6 @@ struct inet_timewait_sock {
#define tw_cookie __tw_common.skc_cookie
#define tw_dr __tw_common.skc_tw_dr
- int tw_timeout;
__u32 tw_mark;
volatile unsigned char tw_substate;
unsigned char tw_rcv_wscale;
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 37ccbe62eb1a..ba6fc3c1186b 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -53,7 +53,6 @@ void dccp_time_wait(struct sock *sk, int state, int timeo)
if (timeo < rto)
timeo = rto;
- tw->tw_timeout = DCCP_TIMEWAIT_LEN;
if (state == DCCP_TIME_WAIT)
timeo = DCCP_TIMEWAIT_LEN;
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index f867658b4b30..1dda1341a223 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -307,7 +307,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
if (timeo < rto)
timeo = rto;
- tw->tw_timeout = TCP_TIMEWAIT_LEN;
if (state == TCP_TIME_WAIT)
timeo = TCP_TIMEWAIT_LEN;
--
2.17.1.1185.g55be947832-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net-tcp: remove useless tw_timeout field
2018-06-05 10:07 [PATCH] net-tcp: remove useless tw_timeout field Maciej Żenczykowski
@ 2018-06-05 12:59 ` Eric Dumazet
2018-06-05 14:45 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Eric Dumazet @ 2018-06-05 12:59 UTC (permalink / raw)
To: Maciej Żenczykowski, Maciej Żenczykowski,
David S . Miller, Eric Dumazet
Cc: netdev
On 06/05/2018 03:07 AM, Maciej Żenczykowski wrote:
> From: Maciej Żenczykowski <maze@google.com>
>
> Tested: 'git grep tw_timeout' comes up empty and it builds :-)
>
> Signed-off-by: Maciej Żenczykowski <maze@google.com>
> Cc: Eric Dumazet <edumazet@google.com>
This field became no longer needed when tcp_tw_recycle was removed in linux-4.12
Signed-off-by: Eric Dumazet <edumazet@google.com>
Thanks Maciej
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net-tcp: remove useless tw_timeout field
2018-06-05 12:59 ` Eric Dumazet
@ 2018-06-05 14:45 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2018-06-05 14:45 UTC (permalink / raw)
To: eric.dumazet; +Cc: zenczykowski, maze, edumazet, netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 5 Jun 2018 05:59:27 -0700
> On 06/05/2018 03:07 AM, Maciej Żenczykowski wrote:
>> From: Maciej Żenczykowski <maze@google.com>
>>
>> Tested: 'git grep tw_timeout' comes up empty and it builds :-)
>>
>> Signed-off-by: Maciej Żenczykowski <maze@google.com>
>> Cc: Eric Dumazet <edumazet@google.com>
>
> This field became no longer needed when tcp_tw_recycle was removed in linux-4.12
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied, thanks everyone.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-05 14:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-05 10:07 [PATCH] net-tcp: remove useless tw_timeout field Maciej Żenczykowski
2018-06-05 12:59 ` Eric Dumazet
2018-06-05 14:45 ` David Miller
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.