diff options
author | Yafang Shao <laoar.shao@gmail.com> | 2017-12-19 22:12:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-20 14:00:25 -0500 |
commit | 986ffdfd08dbaae721e82720e6bfc2c307e732dd (patch) | |
tree | 0aa6bd09827ff4654e2b3f563cb0059945fd6194 /net/ipv4/tcp.c | |
parent | 563e0bb0dc74b3ca888e24f8c08f0239fe4016b0 (diff) |
net: sock: replace sk_state_load with inet_sk_state_load and remove sk_state_store
sk_state_load is only used by AF_INET/AF_INET6, so rename it to
inet_sk_state_load and move it into inet_sock.h.
sk_state_store is removed as it is not used any more.
Signed-off-by: Yafang Shao <laoar.shao@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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index d408fb41c804..67d39b79c801 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -502,7 +502,7 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) | |||
502 | 502 | ||
503 | sock_poll_wait(file, sk_sleep(sk), wait); | 503 | sock_poll_wait(file, sk_sleep(sk), wait); |
504 | 504 | ||
505 | state = sk_state_load(sk); | 505 | state = inet_sk_state_load(sk); |
506 | if (state == TCP_LISTEN) | 506 | if (state == TCP_LISTEN) |
507 | return inet_csk_listen_poll(sk); | 507 | return inet_csk_listen_poll(sk); |
508 | 508 | ||
@@ -2916,7 +2916,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) | |||
2916 | if (sk->sk_type != SOCK_STREAM) | 2916 | if (sk->sk_type != SOCK_STREAM) |
2917 | return; | 2917 | return; |
2918 | 2918 | ||
2919 | info->tcpi_state = sk_state_load(sk); | 2919 | info->tcpi_state = inet_sk_state_load(sk); |
2920 | 2920 | ||
2921 | /* Report meaningful fields for all TCP states, including listeners */ | 2921 | /* Report meaningful fields for all TCP states, including listeners */ |
2922 | rate = READ_ONCE(sk->sk_pacing_rate); | 2922 | rate = READ_ONCE(sk->sk_pacing_rate); |