Merge tag 'nfs-for-4.10-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[karo-tx-linux.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 687e9fdb3d672b9e2a36c0255e5dae51ce2d03a0..849c4ad0411ee22bd322456c7ee69d257d011229 100644 (file)
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -32,7 +32,7 @@ static const struct virtio_transport *virtio_transport_get_ops(void)
        return container_of(t, struct virtio_transport, transport);
 }
 
-struct virtio_vsock_pkt *
+static struct virtio_vsock_pkt *
 virtio_transport_alloc_pkt(struct virtio_vsock_pkt_info *info,
                           size_t len,
                           u32 src_cid,
@@ -82,7 +82,6 @@ out_pkt:
        kfree(pkt);
        return NULL;
 }
-EXPORT_SYMBOL_GPL(virtio_transport_alloc_pkt);
 
 static int virtio_transport_send_pkt_info(struct vsock_sock *vsk,
                                          struct virtio_vsock_pkt_info *info)
@@ -606,9 +605,9 @@ static int virtio_transport_reset_no_sock(struct virtio_vsock_pkt *pkt)
                return 0;
 
        pkt = virtio_transport_alloc_pkt(&info, 0,
-                                        le32_to_cpu(pkt->hdr.dst_cid),
+                                        le64_to_cpu(pkt->hdr.dst_cid),
                                         le32_to_cpu(pkt->hdr.dst_port),
-                                        le32_to_cpu(pkt->hdr.src_cid),
+                                        le64_to_cpu(pkt->hdr.src_cid),
                                         le32_to_cpu(pkt->hdr.src_port));
        if (!pkt)
                return -ENOMEM;
@@ -823,7 +822,7 @@ virtio_transport_send_response(struct vsock_sock *vsk,
        struct virtio_vsock_pkt_info info = {
                .op = VIRTIO_VSOCK_OP_RESPONSE,
                .type = VIRTIO_VSOCK_TYPE_STREAM,
-               .remote_cid = le32_to_cpu(pkt->hdr.src_cid),
+               .remote_cid = le64_to_cpu(pkt->hdr.src_cid),
                .remote_port = le32_to_cpu(pkt->hdr.src_port),
                .reply = true,
        };
@@ -863,9 +862,9 @@ virtio_transport_recv_listen(struct sock *sk, struct virtio_vsock_pkt *pkt)
        child->sk_state = SS_CONNECTED;
 
        vchild = vsock_sk(child);
-       vsock_addr_init(&vchild->local_addr, le32_to_cpu(pkt->hdr.dst_cid),
+       vsock_addr_init(&vchild->local_addr, le64_to_cpu(pkt->hdr.dst_cid),
                        le32_to_cpu(pkt->hdr.dst_port));
-       vsock_addr_init(&vchild->remote_addr, le32_to_cpu(pkt->hdr.src_cid),
+       vsock_addr_init(&vchild->remote_addr, le64_to_cpu(pkt->hdr.src_cid),
                        le32_to_cpu(pkt->hdr.src_port));
 
        vsock_insert_connected(vchild);
@@ -904,9 +903,9 @@ void virtio_transport_recv_pkt(struct virtio_vsock_pkt *pkt)
        struct sock *sk;
        bool space_available;
 
-       vsock_addr_init(&src, le32_to_cpu(pkt->hdr.src_cid),
+       vsock_addr_init(&src, le64_to_cpu(pkt->hdr.src_cid),
                        le32_to_cpu(pkt->hdr.src_port));
-       vsock_addr_init(&dst, le32_to_cpu(pkt->hdr.dst_cid),
+       vsock_addr_init(&dst, le64_to_cpu(pkt->hdr.dst_cid),
                        le32_to_cpu(pkt->hdr.dst_port));
 
        trace_virtio_transport_recv_pkt(src.svm_cid, src.svm_port,