From mboxrd@z Thu Jan 1 00:00:00 1970 From: "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" Subject: [PATCH] net-tcp: remove useless tw_timeout field Date: Tue, 5 Jun 2018 03:07:23 -0700 Message-ID: <20180605100723.164396-1-zenczykowski@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Cc: netdev@vger.kernel.org To: "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" , "David S . Miller" , Eric Dumazet Return-path: Received: from mail-ot0-f202.google.com ([74.125.82.202]:39856 "EHLO mail-ot0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751442AbeFEKHd (ORCPT ); Tue, 5 Jun 2018 06:07:33 -0400 Received: by mail-ot0-f202.google.com with SMTP id p12-v6so1300025oti.6 for ; Tue, 05 Jun 2018 03:07:32 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: From: Maciej Żenczykowski Tested: 'git grep tw_timeout' comes up empty and it builds :-) Signed-off-by: Maciej Żenczykowski Cc: Eric Dumazet --- 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