summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorChristoph Hellwig2018-07-30 09:42:10 +0200
committerDavid S. Miller2018-07-30 18:10:25 +0200
commitdd979b4df817e9976f18fb6f9d134d6bc4a3c317 (patch)
treefffcfba952d7c3d86fbecaf5a14a213bd0d54967 /net/ipv4/tcp.c
parentact_bpf: Use kmemdup instead of duplicating it in tcf_bpf_init_from_ops (diff)
downloadkernel-qcow2-linux-dd979b4df817e9976f18fb6f9d134d6bc4a3c317.tar.gz
kernel-qcow2-linux-dd979b4df817e9976f18fb6f9d134d6bc4a3c317.tar.xz
kernel-qcow2-linux-dd979b4df817e9976f18fb6f9d134d6bc4a3c317.zip
net: simplify sock_poll_wait
The wait_address argument is always directly derived from the filp argument, so remove it. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 514aaac1626f..f3bfb9f29520 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -507,7 +507,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
const struct tcp_sock *tp = tcp_sk(sk);
int state;
- sock_poll_wait(file, sk_sleep(sk), wait);
+ sock_poll_wait(file, wait);
state = inet_sk_state_load(sk);
if (state == TCP_LISTEN)