aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hv/vmbus_drv.c19
-rw-r--r--include/linux/hyperv.h18
2 files changed, 19 insertions, 18 deletions
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index e648571a5b0..0c048dd8013 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -44,6 +44,25 @@ static struct tasklet_struct event_dpc;
44static struct completion probe_event; 44static struct completion probe_event;
45static int irq; 45static int irq;
46 46
47struct hv_device_info {
48 u32 chn_id;
49 u32 chn_state;
50 uuid_le chn_type;
51 uuid_le chn_instance;
52
53 u32 monitor_id;
54 u32 server_monitor_pending;
55 u32 server_monitor_latency;
56 u32 server_monitor_conn_id;
57 u32 client_monitor_pending;
58 u32 client_monitor_latency;
59 u32 client_monitor_conn_id;
60
61 struct hv_dev_port_info inbound;
62 struct hv_dev_port_info outbound;
63};
64
65
47static void get_channel_info(struct hv_device *device, 66static void get_channel_info(struct hv_device *device,
48 struct hv_device_info *info) 67 struct hv_device_info *info)
49{ 68{
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 240e1141cbb..12ec328481d 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -699,24 +699,6 @@ struct hv_dev_port_info {
699 u32 bytes_avail_towrite; 699 u32 bytes_avail_towrite;
700}; 700};
701 701
702struct hv_device_info {
703 u32 chn_id;
704 u32 chn_state;
705 uuid_le chn_type;
706 uuid_le chn_instance;
707
708 u32 monitor_id;
709 u32 server_monitor_pending;
710 u32 server_monitor_latency;
711 u32 server_monitor_conn_id;
712 u32 client_monitor_pending;
713 u32 client_monitor_latency;
714 u32 client_monitor_conn_id;
715
716 struct hv_dev_port_info inbound;
717 struct hv_dev_port_info outbound;
718};
719
720/* Base driver object */ 702/* Base driver object */
721struct hv_driver { 703struct hv_driver {
722 const char *name; 704 const char *name;