Commit db205c76 authored by Stefano Garzarella's avatar Stefano Garzarella Committed by David S. Miller
Browse files

vsock: remove vm_sockets_get_local_cid() 



vm_sockets_get_local_cid() is only used in virtio_transport_common.c.
We can replace it calling the virtio_transport_get_ops() and
using the get_local_cid() callback registered by the transport.

Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarJorgen Hansen <jhansen@vmware.com>
Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ed78bc4

include/linux/vm_sockets.h

+0 −2
Original line number Diff line number Diff line
@@ -10,6 +10,4 @@ 


#include <uapi/linux/vm_sockets.h>



int vm_sockets_get_local_cid(void);



#endif /* _VM_SOCKETS_H */

net/vmw_vsock/af_vsock.c

+0 −10
Original line number Diff line number Diff line
@@ -129,16 +129,6 @@ static struct proto vsock_proto = { 
static const struct vsock_transport *transport;

static DEFINE_MUTEX(vsock_register_mutex);



/**** EXPORTS ****/



/* Get the ID of the local context.  This is transport dependent. */



int vm_sockets_get_local_cid(void)

{

	return transport->get_local_cid();

}

EXPORT_SYMBOL_GPL(vm_sockets_get_local_cid);



/**** UTILS ****/



/* Each bound VSocket is stored in the bind hash table and each connected

net/vmw_vsock/virtio_transport_common.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, 
	struct virtio_vsock_pkt *pkt;

	u32 pkt_len = info->pkt_len;



	src_cid = vm_sockets_get_local_cid();

	src_cid = virtio_transport_get_ops()->transport.get_local_cid();

	src_port = vsk->local_addr.svm_port;

	if (!info->remote_cid) {

		dst_cid	= vsk->remote_addr.svm_cid;

CRA Git | Maintained and supported by SUSTech CRA and CCSE