Skip to contentSkip to conversation

net-tcp: remove useless tw_timeout field

PATCH Applied Maciej Żenczykowski 3 participants 3 messages Jun 5, 2018

Subsystems (3)
Networking Network drivers TCP
lore
Share & tools
lore

Maciej Żenczykowski

author
#0 lore raw

PATCH 1/1 net-tcp: remove useless tw_timeout field

From: Maciej Żenczykowski <[email protected]>

Tested: 'git grep tw_timeout' comes up empty and it builds :-)

Signed-off-by Maciej Żenczykowski <[email protected]>
Cc Eric Dumazet <[email protected]>
---
 include/net/inet_timewait_sock.h | 1 -
 net/dccp/minisocks.c             | 1 -
 net/ipv4/tcp_minisocks.c         | 1 -
 3 files changed, 3 deletions(-)
include/net/inet_timewait_sock.h +0 -1
index 659d8ed5a3bc..78775038f011 100644
@@ -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;
net/dccp/minisocks.c +0 -1
index 37ccbe62eb1a..ba6fc3c1186b 100644
@@ -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;
net/ipv4/tcp_minisocks.c +0 -1
index f867658b4b30..1dda1341a223 100644
@@ -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;
Signature · 1 line
2.17.1.1185.g55be947832-goog
maintainer Applied
#2 lore raw

From: Eric Dumazet <[email protected]>
Date: Tue, 5 Jun 2018 05:59:27 -0700

Quoted 11 lines · Maciej Żenczykowski
Quoted 6 lines

From: Maciej Żenczykowski <[email protected]>

Tested: 'git grep tw_timeout' comes up empty and it builds :-)

Signed-off-by Maciej Żenczykowski <[email protected]>
Cc Eric Dumazet <[email protected]>

This field became no longer needed when tcp_tw_recycle was removed in linux-4.12

Signed-off-by Eric Dumazet <[email protected]>

Applied, thanks everyone.