net-tcp: remove useless tw_timeout field

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>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 659d8ed5a3bc098dcfc697dcd5c8df83873c1950..78775038f011f8880922419f25d325ffedd524f8 100644 (file)
--- 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 37ccbe62eb1af3f9dffbf63323c008cc96cd8ea1..ba6fc3c1186b97c6fd7bb01d4de691cdb254f0ec 100644 (file)
--- 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 f867658b4b30fbe8785688252bb902ab015e1bc9..1dda1341a223937580b4efdbedb21ae50b221ff7 100644 (file)
--- 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;