[PATCH] tcp: Remove unused tcpct declarations and comments

[PATCH] tcp: Remove unused tcpct declarations and comments

[Dmitry Popov]

Remove declaration, 4 defines and confusing comment that are no longer used
since 1a2c6181c4 ("tcp: Remove TCPCT").

Signed-off-by: Dmitry Popov <dp@highloadlab.com>
---
 include/linux/tcp.h | 1 -
 include/net/tcp.h   | 4 ----
 net/ipv4/tcp.c      | 4 ----
 3 files changed, 9 deletions(-)

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 472120b..b7e01bc 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -107,7 +107,6 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
  * only four options will fit in a standard TCP header */
 #define TCP_NUM_SACKS 4
 
-struct tcp_cookie_values;
 struct tcp_request_sock_ops;
 
 struct tcp_request_sock {
diff --git a/include/net/tcp.h b/include/net/tcp.h
index d198005..fa6893c 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -192,10 +192,6 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCPOLEN_TIMESTAMP      10
 #define TCPOLEN_MD5SIG         18
 #define TCPOLEN_EXP_FASTOPEN_BASE  4
-#define TCPOLEN_COOKIE_BASE    2	/* Cookie-less header extension */
-#define TCPOLEN_COOKIE_PAIR    3	/* Cookie pair header extension */
-#define TCPOLEN_COOKIE_MIN     (TCPOLEN_COOKIE_BASE+TCP_COOKIE_MIN)
-#define TCPOLEN_COOKIE_MAX     (TCPOLEN_COOKIE_BASE+TCP_COOKIE_MAX)
 
 /* But this is what stacks really send out. */
 #define TCPOLEN_TSTAMP_ALIGNED		12
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 5423223..077abde 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -410,10 +410,6 @@ void tcp_init_sock(struct sock *sk)
 
 	icsk->icsk_sync_mss = tcp_sync_mss;
 
-	/* Presumed zeroed, in order of appearance:
-	 *	cookie_in_always, cookie_out_never,
-	 *	s_data_constant, s_data_in, s_data_out
-	 */
 	sk->sk_sndbuf = sysctl_tcp_wmem[1];
 	sk->sk_rcvbuf = sysctl_tcp_rmem[1];
 

Re: [PATCH] tcp: Remove unused tcpct declarations and comments

[Christoph Paasch]

On 31/07/13 - 13:39:45, Dmitry Popov wrote:
> Remove declaration, 4 defines and confusing comment that are no longer used
> since 1a2c6181c4 ("tcp: Remove TCPCT").
> 
> Signed-off-by: Dmitry Popov <dp@highloadlab.com>
> ---
>  include/linux/tcp.h | 1 -
>  include/net/tcp.h   | 4 ----
>  net/ipv4/tcp.c      | 4 ----
>  3 files changed, 9 deletions(-)

Sorry, I oversaw these when removing TCPCT.

Acked-by: Christoph Paasch <christoph.paasch@uclouvain.be>

Re: [PATCH] tcp: Remove unused tcpct declarations and comments

[David Miller]

From: Christoph Paasch <christoph.paasch@gmail.com>
Date: Wed, 31 Jul 2013 13:08:21 +0200

> On 31/07/13 - 13:39:45, Dmitry Popov wrote:
>> Remove declaration, 4 defines and confusing comment that are no longer used
>> since 1a2c6181c4 ("tcp: Remove TCPCT").
>> 
>> Signed-off-by: Dmitry Popov <dp@highloadlab.com>
>> ---
>>  include/linux/tcp.h | 1 -
>>  include/net/tcp.h   | 4 ----
>>  net/ipv4/tcp.c      | 4 ----
>>  3 files changed, 9 deletions(-)
> 
> Sorry, I oversaw these when removing TCPCT.
> 
> Acked-by: Christoph Paasch <christoph.paasch@uclouvain.be>

Applied, thanks.