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

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
...@@ -10,6 +10,4 @@ ...@@ -10,6 +10,4 @@
#include <uapi/linux/vm_sockets.h> #include <uapi/linux/vm_sockets.h>
int vm_sockets_get_local_cid(void);
#endif /* _VM_SOCKETS_H */ #endif /* _VM_SOCKETS_H */
...@@ -129,16 +129,6 @@ static struct proto vsock_proto = { ...@@ -129,16 +129,6 @@ static struct proto vsock_proto = {
static const struct vsock_transport *transport; static const struct vsock_transport *transport;
static DEFINE_MUTEX(vsock_register_mutex); 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 ****/ /**** UTILS ****/
/* Each bound VSocket is stored in the bind hash table and each connected /* Each bound VSocket is stored in the bind hash table and each connected
......
...@@ -168,7 +168,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, ...@@ -168,7 +168,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk,
struct virtio_vsock_pkt *pkt; struct virtio_vsock_pkt *pkt;
u32 pkt_len = info->pkt_len; 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; src_port = vsk->local_addr.svm_port;
if (!info->remote_cid) { if (!info->remote_cid) {
dst_cid = vsk->remote_addr.svm_cid; dst_cid = vsk->remote_addr.svm_cid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment