diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2018-08-06 09:04:48 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2018-08-06 09:04:48 +0200 |
| commit | a30461080366214b690a367225a48c95d7a6a189 (patch) | |
| tree | 02cd7cfb8cea14cebe1ab2a1638edd8c9b9e0d3f /net/dccp/proto.c | |
| parent | 811e299f4645588cc7a1b78d97b6847c155324b9 (diff) | |
| parent | 981467033a37d916649647fa3afe1fe99bba1817 (diff) | |
| download | linux-a30461080366214b690a367225a48c95d7a6a189.tar.bz2 | |
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'net/dccp/proto.c')
| -rw-r--r-- | net/dccp/proto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 0d56e36a6db7..875858c8b059 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -325,7 +325,7 @@ __poll_t dccp_poll(struct file *file, struct socket *sock, __poll_t mask; struct sock *sk = sock->sk; - sock_poll_wait(file, sk_sleep(sk), wait); + sock_poll_wait(file, wait); if (sk->sk_state == DCCP_LISTEN) return inet_csk_listen_poll(sk); |