Skip to contentSkip to conversation

tcp: Cleanup duplicate initialization of sk->sk_state.

PATCH Applied [email protected] 2 participants 2 messages Dec 10, 2019 – Dec 11, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tcp: Cleanup duplicate initialization of sk->sk_state.

From: Kuniyuki Iwashima <[email protected]>

When a TCP socket is created, sk->sk_state is initialized twice as TCP_CLOSE in sock_init_data() and tcp_init_sock(). The tcp_init_sock() is always called after the sock_init_data(), so it is not necessary to update sk->sk_state in the tcp_init_sock().

Before v2.1.8, the code of the two functions was in the inet_create(). In the patch of v2.1.8, the tcp_v4/v6_init_sock() were added and the code of initialization of sk->state was duplicated.

---
 net/ipv4/tcp.c | 2 --
 1 file changed, 2 deletions(-)
net/ipv4/tcp.c +0 -2
index 8a39ee794891..09e2cae92956 100644
@@ -443,8 +443,6 @@ void tcp_init_sock(struct sock *sk)
 	tp->tsoffset = 0;
 	tp->rack.reo_wnd_steps = 1;
 
-	sk->sk_state = TCP_CLOSE;
-
 	sk->sk_write_space = sk_stream_write_space;
 	sock_set_flag(sk, SOCK_USE_WRITE_QUEUE);
 
Signature · 1 line
2.17.2
maintainer Applied
#1 lore raw

From: [email protected]
Date: Tue, 10 Dec 2019 02:41:48 +0000

Quoted 7 lines

From: Kuniyuki Iwashima <[email protected]>

When a TCP socket is created, sk->sk_state is initialized twice as TCP_CLOSE in sock_init_data() and tcp_init_sock(). The tcp_init_sock() is always called after the sock_init_data(), so it is not necessary to update sk->sk_state in the tcp_init_sock().

Quoted 5 lines

Before v2.1.8, the code of the two functions was in the inet_create(). In the patch of v2.1.8, the tcp_v4/v6_init_sock() were added and the code of initialization of sk->state was duplicated.

Applied, thanks.