diff options
| author |   Kuniyuki Iwashima <kuni1840@gmail.com> | 2019-12-10 02:41:48 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-12-10 17:33:29 -0800 |
| commit | 5000b28b0b1a34144b39376318cafb8c2a0f79fd (patch) | |
| tree | 14e856db8fae0c72c1596865afb0c55db34dfa20 /net/ipv4/tcp.c | |
| parent | enetc: add software timestamping (diff) | |
| download | linux-dev-5000b28b0b1a34144b39376318cafb8c2a0f79fd.tar.xz linux-dev-5000b28b0b1a34144b39376318cafb8c2a0f79fd.zip | |
tcp: Cleanup duplicate initialization of sk->sk_state.
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.
Signed-off-by: Kuniyuki Iwashima <kuni1840@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8a39ee794891..09e2cae92956 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -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); |