staging: rtl8192e: Pass priv to TranslateRxSignalStuff819xpci

[deliverable/linux.git] / drivers / staging / hv / channel_mgmt.h

diff --git a/drivers/staging/hv/channel_mgmt.h b/drivers/staging/hv/channel_mgmt.h
index de6b2a0ebf701d8bf26bcaaa94a554ac397e4f93..3368bf14e3cda4f2915c058ae7fec30e73c0a0ff 100644 (file)
--- a/drivers/staging/hv/channel_mgmt.h
+++ b/drivers/staging/hv/channel_mgmt.h
@@ -60,19 +60,19 @@ enum vmbus_channel_message_type {
 struct vmbus_channel_message_header {
        enum vmbus_channel_message_type msgtype;
        u32 padding;
-} __attribute__((packed));
+} __packed;
 
 /* Query VMBus Version parameters */
 struct vmbus_channel_query_vmbus_version {
        struct vmbus_channel_message_header header;
        u32 version;
-} __attribute__((packed));
+} __packed;
 
 /* VMBus Version Supported parameters */
 struct vmbus_channel_version_supported {
        struct vmbus_channel_message_header header;
        bool version_supported;
-} __attribute__((packed));
+} __packed;
 
 /* Offer Channel parameters */
 struct vmbus_channel_offer_channel {
@@ -81,13 +81,13 @@ struct vmbus_channel_offer_channel {
        u32 child_relid;
        u8 monitorid;
        bool monitor_allocated;
-} __attribute__((packed));
+} __packed;
 
 /* Rescind Offer parameters */
 struct vmbus_channel_rescind_offer {
        struct vmbus_channel_message_header header;
        u32 child_relid;
-} __attribute__((packed));
+} __packed;
 
 /*
  * Request Offer -- no parameters, SynIC message contains the partition ID
@@ -123,7 +123,7 @@ struct vmbus_channel_open_channel {
 
        /* User-specific data to be passed along to the server endpoint. */
        unsigned char userdata[MAX_USER_DEFINED_BYTES];
-} __attribute__((packed));
+} __packed;
 
 /* Open Channel Result parameters */
 struct vmbus_channel_open_result {
@@ -131,13 +131,13 @@ struct vmbus_channel_open_result {
        u32 child_relid;
        u32 openid;
        u32 status;
-} __attribute__((packed));
+} __packed;
 
 /* Close channel parameters; */
 struct vmbus_channel_close_channel {
        struct vmbus_channel_message_header header;
        u32 child_relid;
-} __attribute__((packed));
+} __packed;
 
 /* Channel Message GPADL */
 #define GPADL_TYPE_RING_BUFFER         1
@@ -157,7 +157,7 @@ struct vmbus_channel_gpadl_header {
        u16 range_buflen;
        u16 rangecount;
        struct gpa_range range[0];
-} __attribute__((packed));
+} __packed;
 
 /* This is the followup packet that contains more PFNs. */
 struct vmbus_channel_gpadl_body {
@@ -165,25 +165,25 @@ struct vmbus_channel_gpadl_body {
        u32 msgnumber;
        u32 gpadl;
        u64 pfn[0];
-} __attribute__((packed));
+} __packed;
 
 struct vmbus_channel_gpadl_created {
        struct vmbus_channel_message_header header;
        u32 child_relid;
        u32 gpadl;
        u32 creation_status;
-} __attribute__((packed));
+} __packed;
 
 struct vmbus_channel_gpadl_teardown {
        struct vmbus_channel_message_header header;
        u32 child_relid;
        u32 gpadl;
-} __attribute__((packed));
+} __packed;
 
 struct vmbus_channel_gpadl_torndown {
        struct vmbus_channel_message_header header;
        u32 gpadl;
-} __attribute__((packed));
+} __packed;
 
 #ifdef VMBUS_FEATURE_PARENT_OR_PEER_MEMORY_MAPPED_INTO_A_CHILD
 struct vmbus_channel_view_range_add {
@@ -191,19 +191,19 @@ struct vmbus_channel_view_range_add {
        PHYSICAL_ADDRESS viewrange_base;
        u64 viewrange_length;
        u32 child_relid;
-} __attribute__((packed));
+} __packed;
 
 struct vmbus_channel_view_range_remove {
        struct vmbus_channel_message_header header;
        PHYSICAL_ADDRESS viewrange_base;
        u32 child_relid;
-} __attribute__((packed));
+} __packed;
 #endif
 
 struct vmbus_channel_relid_released {
        struct vmbus_channel_message_header header;
        u32 child_relid;
-} __attribute__((packed));
+} __packed;
 
 struct vmbus_channel_initiate_contact {
        struct vmbus_channel_message_header header;
@@ -212,12 +212,12 @@ struct vmbus_channel_initiate_contact {
        u64 interrupt_page;
        u64 monitor_page1;
        u64 monitor_page2;
-} __attribute__((packed));
+} __packed;
 
 struct vmbus_channel_version_response {
        struct vmbus_channel_message_header header;
        bool version_supported;
-} __attribute__((packed));
+} __packed;
 
 enum vmbus_channel_state {
        CHANNEL_OFFER_STATE,
@@ -289,8 +289,8 @@ struct vmbus_channel_msginfo {
        struct list_head submsglist;
 
        /* Synchronize the request/response if needed */
-       struct osd_waitevent *waitevent;
-
+       int wait_condition;
+       wait_queue_head_t waitevent;
        union {
                struct vmbus_channel_version_supported version_supported;
                struct vmbus_channel_open_result open_result;