From: Arseniy Krasnov <oxfff...@gmail.com>

        Replace 'stream' to 'connect oriented' as SOCK_SEQPACKET
support is also connect oriented.
---
 net/vmw_vsock/af_vsock.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 30caad9815f7..063d428e9ec2 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -415,8 +415,8 @@ static void vsock_deassign_transport(struct vsock_sock *vsk)
 
 /* Assign a transport to a socket and call the .init transport callback.
  *
- * Note: for stream socket this must be called when vsk->remote_addr is set
- * (e.g. during the connect() or when a connection request on a listener
+ * Note: for connect oriented socket this must be called when vsk->remote_addr
+ * is set (e.g. during the connect() or when a connection request on a listener
  * socket is received).
  * The vsk->remote_addr is used to decide which transport to use:
  *  - remote CID == VMADDR_CID_LOCAL or g2h->local_cid or VMADDR_CID_HOST if
@@ -476,10 +476,10 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct 
vsock_sock *psk)
                        return 0;
 
                /* transport->release() must be called with sock lock acquired.
-                * This path can only be taken during vsock_stream_connect(),
-                * where we have already held the sock lock.
-                * In the other cases, this function is called on a new socket
-                * which is not assigned to any transport.
+                * This path can only be taken during vsock_connect(), where we
+                * have already held the sock lock. In the other cases, this
+                * function is called on a new socket which is not assigned to
+                * any transport.
                 */
                vsk->transport->release(vsk);
                vsock_deassign_transport(vsk);
@@ -656,9 +656,10 @@ static int __vsock_bind_connectible(struct vsock_sock *vsk,
 
        vsock_addr_init(&vsk->local_addr, new_addr.svm_cid, new_addr.svm_port);
 
-       /* Remove stream sockets from the unbound list and add them to the hash
-        * table for easy lookup by its address.  The unbound list is simply an
-        * extra entry at the end of the hash table, a trick used by AF_UNIX.
+       /* Remove connect oriented sockets from the unbound list and add them
+        * to the hash table for easy lookup by its address.  The unbound list
+        * is simply an extra entry at the end of the hash table, a trick used
+        * by AF_UNIX.
         */
        __vsock_remove_bound(vsk);
        __vsock_insert_bound(vsock_bound_sockets(&vsk->local_addr), vsk);
@@ -949,10 +950,10 @@ static int vsock_shutdown(struct socket *sock, int mode)
        if ((mode & ~SHUTDOWN_MASK) || !mode)
                return -EINVAL;
 
-       /* If this is a STREAM socket and it is not connected then bail out
-        * immediately.  If it is a DGRAM socket then we must first kick the
-        * socket so that it wakes up from any sleeping calls, for example
-        * recv(), and then afterwards return the error.
+       /* If this is a connect oriented socket and it is not connected then
+        * bail out immediately.  If it is a DGRAM socket then we must first
+        * kick the socket so that it wakes up from any sleeping calls, for
+        * example recv(), and then afterwards return the error.
         */
 
        sk = sock->sk;
@@ -1757,7 +1758,9 @@ static int vsock_connectible_sendmsg(struct socket *sock, 
struct msghdr *msg,
 
        lock_sock(sk);
 
-       /* Callers should not provide a destination with stream sockets. */
+       /* Callers should not provide a destination with connect oriented
+        * sockets.
+        */
        if (msg->msg_namelen) {
                err = sk->sk_state == TCP_ESTABLISHED ? -EISCONN : -EOPNOTSUPP;
                goto out;
-- 
2.25.1

Reply via email to