diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:07:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-11 13:07:13 +0100 |
| commit | 6f38751510073cc054c5dffc3339b22f9385ceed (patch) | |
| tree | b7704b2d3388293118a6794f7a858e8891bcec60 /drivers/vhost | |
| parent | f4ec57b632fe15ed7a355099cb96ed4b647416de (diff) | |
| parent | 045169816b31b10faed984b01c390db1b32ee4c1 (diff) | |
| download | op-kernel-dev-6f38751510073cc054c5dffc3339b22f9385ceed.zip op-kernel-dev-6f38751510073cc054c5dffc3339b22f9385ceed.tar.gz | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index e3b30ea..a504e2e0 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -506,7 +506,7 @@ static void vhost_vsock_reset_orphans(struct sock *sk) * executing. */ - if (!vhost_vsock_get(vsk->local_addr.svm_cid)) { + if (!vhost_vsock_get(vsk->remote_addr.svm_cid)) { sock_set_flag(sk, SOCK_DONE); vsk->peer_shutdown = SHUTDOWN_MASK; sk->sk_state = SS_UNCONNECTED; |
