[PATCH net-next] Remove unused tw_cookie_values from tcp_timewait_sock

[PATCH net-next] Remove unused tw_cookie_values from tcp_timewait_sock

[Christoph Paasch]

tw_cookie_values is never used in the TCP-stack.

It was added by 435cf559f (TCPCT part 1d: define TCP cookie option,
extend existing struct's), but already at that time it was not used at
all, nor mentioned in the commit-message.

Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
---
 include/linux/tcp.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index f28408c..515c374 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -361,10 +361,6 @@ struct tcp_timewait_sock {
 #ifdef CONFIG_TCP_MD5SIG
 	struct tcp_md5sig_key	  *tw_md5_key;
 #endif
-	/* Few sockets in timewait have cookies; in that case, then this
-	 * object holds a reference to them (tw_cookie_values->kref).
-	 */
-	struct tcp_cookie_values  *tw_cookie_values;
 };
 
 static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
-- 
1.8.1.227.g44fe835

Re: [PATCH net-next] Remove unused tw_cookie_values from tcp_timewait_sock

[Eric Dumazet]

On Sun, 2013-03-10 at 16:18 +0100, Christoph Paasch wrote:
> tw_cookie_values is never used in the TCP-stack.
> 
> It was added by 435cf559f (TCPCT part 1d: define TCP cookie option,
> extend existing struct's), but already at that time it was not used at
> all, nor mentioned in the commit-message.
> 
> Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
> ---
>  include/linux/tcp.h | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/include/linux/tcp.h b/include/linux/tcp.h
> index f28408c..515c374 100644
> --- a/include/linux/tcp.h
> +++ b/include/linux/tcp.h
> @@ -361,10 +361,6 @@ struct tcp_timewait_sock {
>  #ifdef CONFIG_TCP_MD5SIG
>  	struct tcp_md5sig_key	  *tw_md5_key;
>  #endif
> -	/* Few sockets in timewait have cookies; in that case, then this
> -	 * object holds a reference to them (tw_cookie_values->kref).
> -	 */
> -	struct tcp_cookie_values  *tw_cookie_values;
>  };
>  
>  static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)

Acked-by: Eric Dumazet <edumazet@google.com>

Actually, I am not sure TCPCT is really used...

Re: [PATCH net-next] Remove unused tw_cookie_values from tcp_timewait_sock

[Christoph Paasch]

On Sunday 10 March 2013 17:06:10 Eric Dumazet wrote:
> Acked-by: Eric Dumazet <edumazet@google.com>
> 
> Actually, I am not sure TCPCT is really used...

Yes, while looking through the code it seems to me that it is far from 
respecting RFC 6013.

It uses 253 as option-number and has comments saying "not yet implemented" 
(e.g., tcp_parse_options).

Should it be removed?


Christoph

-- 
IP Networking Lab --- http://inl.info.ucl.ac.be
MultiPath TCP in the Linux Kernel --- http://mptcp.info.ucl.ac.be
UCLouvain
--

Re: [PATCH net-next] Remove unused tw_cookie_values from tcp_timewait_sock

[David Miller]

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 10 Mar 2013 17:06:10 +0100

> On Sun, 2013-03-10 at 16:18 +0100, Christoph Paasch wrote:
>> tw_cookie_values is never used in the TCP-stack.
>> 
>> It was added by 435cf559f (TCPCT part 1d: define TCP cookie option,
>> extend existing struct's), but already at that time it was not used at
>> all, nor mentioned in the commit-message.
>> 
>> Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
 ...
> Acked-by: Eric Dumazet <edumazet@google.com>

Applied, thanks.