Skip to content

Commit 72a0992

Browse files
committed
Merge fix/vsock/5.15 into v5.15.90
* commit 'c9e883dfbd7be1194e53133d888b435b277e2e5b': vsock: fix possible infinite sleep in vsock_connectible_wait_data() vsock: remove the unused 'wait' in vsock_connectible_recvmsg()
2 parents ad259b2 + c9e883d commit 72a0992

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

net/vmw_vsock/af_vsock.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,8 +2087,6 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
20872087
const struct vsock_transport *transport;
20882088
int err;
20892089

2090-
DEFINE_WAIT(wait);
2091-
20922090
sk = sock->sk;
20932091
vsk = vsock_sk(sk);
20942092
err = 0;

0 commit comments

Comments
 (0)