diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-08 02:04:26 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-08 02:04:26 +0100 |
| commit | e876b41ab074561d65f213bf5e0fc68cf5bc7380 (patch) | |
| tree | 5bcbd7e4f7b6ac2a34e61011f8eb2cde90bf8603 /net/dccp/proto.c | |
| parent | Merge tag 'topic/drm-misc-2015-12-04' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | Linux 4.4-rc4 (diff) | |
| download | linux-e876b41ab074561d65f213bf5e0fc68cf5bc7380.tar.xz linux-e876b41ab074561d65f213bf5e0fc68cf5bc7380.zip | |
Back merge tag 'v4.4-rc4' into drm-next
We've picked up a few conflicts and it would be nice
to resolve them before we move onwards.
Diffstat (limited to 'net/dccp/proto.c')
| -rw-r--r-- | net/dccp/proto.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index b5cf13a28009..41e65804ddf5 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -339,8 +339,7 @@ unsigned int dccp_poll(struct file *file, struct socket *sock, if (sk_stream_is_writeable(sk)) { mask |= POLLOUT | POLLWRNORM; } else { /* send SIGIO later */ - set_bit(SOCK_ASYNC_NOSPACE, - &sk->sk_socket->flags); + sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk); set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); /* Race breaker. If space is freed after |