~hc/RK356X_SDK_RELEASE.git

summary
commits
tree
docs
forks
compare

blame | history | patch | commit | commitdiff

2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c

 kernel/net/vmw_vsock/af_vsock.c
.. .. @@ -1367,7 +1367,7 @@
1367 1367  			vsock_transport_cancel_pkt(vsk);
1368 1368  			vsock_remove_connected(vsk);
1369 1369  			goto out_wait;
1370 -		} else if (timeout == 0) {
1370 +		} else if ((sk->sk_state != TCP_ESTABLISHED) && (timeout == 0)) {
1371 1371  			err = -ETIMEDOUT;
1372 1372  			sk->sk_state = TCP_CLOSE;
1373 1373  			sock->state = SS_UNCONNECTED;

..	..	@@ -1367,7 +1367,7 @@
1367	1367	vsock_transport_cancel_pkt(vsk);
1368	1368	vsock_remove_connected(vsk);
1369	1369	goto out_wait;
1370		- } else if (timeout == 0) {
	1370	+ } else if ((sk->sk_state != TCP_ESTABLISHED) && (timeout == 0)) {
1371	1371	err = -ETIMEDOUT;
1372	1372	sk->sk_state = TCP_CLOSE;
1373	1373	sock->state = SS_UNCONNECTED;