Merge branch 'bcache-for-3.14' of git://evilpiepirate.org/~kent/linux-bcache into...

[cascardo/linux.git] / net / vmw_vsock / vmci_transport.c

diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 687360d..9bb63ff 100644 (file)
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -1779,10 +1779,8 @@ static int vmci_transport_dgram_dequeue(struct kiocb *kiocb,
                goto out;
 
        if (msg->msg_name) {
-               struct sockaddr_vm *vm_addr;
-
                /* Provide the address of the sender. */
-               vm_addr = (struct sockaddr_vm *)msg->msg_name;
+               DECLARE_SOCKADDR(struct sockaddr_vm *, vm_addr, msg->msg_name);
                vsock_addr_init(vm_addr, dg->src.context, dg->src.resource);
                msg->msg_namelen = sizeof(*vm_addr);
        }