diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-01-29 10:14:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-29 10:15:51 -0500 |
| commit | 3e3ab9ccca5b50b11bd4d16c2048b667343354bd (patch) | |
| tree | 7279f7401e7cc2b93fb7cb2bff894b5385429a68 /net/vmw_vsock/af_vsock.c | |
| parent | Merge tag 'wireless-drivers-next-for-davem-2018-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-3e3ab9ccca5b50b11bd4d16c2048b667343354bd.tar.xz linux-dev-3e3ab9ccca5b50b11bd4d16c2048b667343354bd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock/af_vsock.c')
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 5d28abf87fbf..c9473d698525 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -951,7 +951,7 @@ static unsigned int vsock_poll(struct file *file, struct socket *sock, * POLLOUT|POLLWRNORM when peer is closed and nothing to read, * but local send is not shutdown. */ - if (sk->sk_state == TCP_CLOSE) { + if (sk->sk_state == TCP_CLOSE || sk->sk_state == TCP_CLOSING) { if (!(sk->sk_shutdown & SEND_SHUTDOWN)) mask |= POLLOUT | POLLWRNORM; |