net: wan: x25_asy: mark expected switch fall-through

[mirror_ubuntu-bionic-kernel.git] / net / vmw_vsock / virtio_transport_common.c

diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index edba7ab975639fc08c4257d0393391477979b1aa..3ae3a33da70bab034c29552c1f7e04b9b3d52c4d 100644 (file)
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -708,7 +708,7 @@ static void virtio_transport_do_close(struct vsock_sock *vsk,
        sock_set_flag(sk, SOCK_DONE);
        vsk->peer_shutdown = SHUTDOWN_MASK;
        if (vsock_stream_has_data(vsk) <= 0)
-               sk->sk_state = SS_DISCONNECTING;
+               sk->sk_state = TCP_CLOSING;
        sk->sk_state_change(sk);
 
        if (vsk->close_work_scheduled &&
@@ -748,8 +748,8 @@ static bool virtio_transport_close(struct vsock_sock *vsk)
 {
        struct sock *sk = &vsk->sk;
 
-       if (!(sk->sk_state == SS_CONNECTED ||
-             sk->sk_state == SS_DISCONNECTING))
+       if (!(sk->sk_state == TCP_ESTABLISHED ||
+             sk->sk_state == TCP_CLOSING))
                return true;
 
        /* Already received SHUTDOWN from peer, reply with RST */
@@ -801,7 +801,7 @@ virtio_transport_recv_connecting(struct sock *sk,
 
        switch (le16_to_cpu(pkt->hdr.op)) {
        case VIRTIO_VSOCK_OP_RESPONSE:
-               sk->sk_state = SS_CONNECTED;
+               sk->sk_state = TCP_ESTABLISHED;
                sk->sk_socket->state = SS_CONNECTED;
                vsock_insert_connected(vsk);
                sk->sk_state_change(sk);
@@ -821,7 +821,7 @@ virtio_transport_recv_connecting(struct sock *sk,
 
 destroy:
        virtio_transport_reset(vsk, pkt);
-       sk->sk_state = SS_UNCONNECTED;
+       sk->sk_state = TCP_CLOSE;
        sk->sk_err = skerr;
        sk->sk_error_report(sk);
        return err;
@@ -857,7 +857,7 @@ virtio_transport_recv_connected(struct sock *sk,
                        vsk->peer_shutdown |= SEND_SHUTDOWN;
                if (vsk->peer_shutdown == SHUTDOWN_MASK &&
                    vsock_stream_has_data(vsk) <= 0)
-                       sk->sk_state = SS_DISCONNECTING;
+                       sk->sk_state = TCP_CLOSING;
                if (le32_to_cpu(pkt->hdr.flags))
                        sk->sk_state_change(sk);
                break;
@@ -928,7 +928,7 @@ virtio_transport_recv_listen(struct sock *sk, struct virtio_vsock_pkt *pkt)
 
        lock_sock_nested(child, SINGLE_DEPTH_NESTING);
 
-       child->sk_state = SS_CONNECTED;
+       child->sk_state = TCP_ESTABLISHED;
 
        vchild = vsock_sk(child);
        vsock_addr_init(&vchild->local_addr, le64_to_cpu(pkt->hdr.dst_cid),
@@ -1016,18 +1016,18 @@ void virtio_transport_recv_pkt(struct virtio_vsock_pkt *pkt)
                sk->sk_write_space(sk);
 
        switch (sk->sk_state) {
-       case VSOCK_SS_LISTEN:
+       case TCP_LISTEN:
                virtio_transport_recv_listen(sk, pkt);
                virtio_transport_free_pkt(pkt);
                break;
-       case SS_CONNECTING:
+       case TCP_SYN_SENT:
                virtio_transport_recv_connecting(sk, pkt);
                virtio_transport_free_pkt(pkt);
                break;
-       case SS_CONNECTED:
+       case TCP_ESTABLISHED:
                virtio_transport_recv_connected(sk, pkt);
                break;
-       case SS_DISCONNECTING:
+       case TCP_CLOSING:
                virtio_transport_recv_disconnecting(sk, pkt);
                virtio_transport_free_pkt(pkt);
                break;