Просмотр исходного кода

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>
Maciej Żenczykowski 7 лет назад
Родитель
Сommit
95358a9553
3 измененных файлов с 0 добавлено и 3 удалено
  1. 0 1
      include/net/inet_timewait_sock.h
  2. 0 1
      net/dccp/minisocks.c
  3. 0 1
      net/ipv4/tcp_minisocks.c

+ 0 - 1
include/net/inet_timewait_sock.h

@@ -61,7 +61,6 @@ struct inet_timewait_sock {
 #define tw_cookie		__tw_common.skc_cookie
 #define tw_cookie		__tw_common.skc_cookie
 #define tw_dr			__tw_common.skc_tw_dr
 #define tw_dr			__tw_common.skc_tw_dr
 
 
-	int			tw_timeout;
 	__u32			tw_mark;
 	__u32			tw_mark;
 	volatile unsigned char	tw_substate;
 	volatile unsigned char	tw_substate;
 	unsigned char		tw_rcv_wscale;
 	unsigned char		tw_rcv_wscale;

+ 0 - 1
net/dccp/minisocks.c

@@ -53,7 +53,6 @@ void dccp_time_wait(struct sock *sk, int state, int timeo)
 		if (timeo < rto)
 		if (timeo < rto)
 			timeo = rto;
 			timeo = rto;
 
 
-		tw->tw_timeout = DCCP_TIMEWAIT_LEN;
 		if (state == DCCP_TIME_WAIT)
 		if (state == DCCP_TIME_WAIT)
 			timeo = DCCP_TIMEWAIT_LEN;
 			timeo = DCCP_TIMEWAIT_LEN;
 
 

+ 0 - 1
net/ipv4/tcp_minisocks.c

@@ -307,7 +307,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
 		if (timeo < rto)
 		if (timeo < rto)
 			timeo = rto;
 			timeo = rto;
 
 
-		tw->tw_timeout = TCP_TIMEWAIT_LEN;
 		if (state == TCP_TIME_WAIT)
 		if (state == TCP_TIME_WAIT)
 			timeo = TCP_TIMEWAIT_LEN;
 			timeo = TCP_TIMEWAIT_LEN;