Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162229
b: refs/heads/master
c: 1732a1e
h: refs/heads/master
i:
  162227: c7313f2
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Sep 15, 2009
1 parent fc50bca commit 8f623c8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1aa2383b144be596f7a09e237e47ecefdeef07af
refs/heads/master: 1732a1e8a48459cfe4b6244284507a321e9b7725
6 changes: 3 additions & 3 deletions trunk/drivers/staging/hv/include/ChannelMessages.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ typedef struct _VMBUS_CHANNEL_VERSION_SUPPORTED
typedef struct _VMBUS_CHANNEL_OFFER_CHANNEL
{
VMBUS_CHANNEL_MESSAGE_HEADER Header;
VMBUS_CHANNEL_OFFER Offer;
struct vmbus_channel_offer Offer;
u32 ChildRelId;
u8 MonitorId;
bool MonitorAllocated;
Expand Down Expand Up @@ -131,12 +131,12 @@ typedef struct _VMBUS_CHANNEL_OPEN_CHANNEL

/* GPADL for the channel's ring buffer. */

GPADL_HANDLE RingBufferGpadlHandle;
u32 RingBufferGpadlHandle;


/* GPADL for the channel's server context save area. */

GPADL_HANDLE ServerContextAreaGpadlHandle;
u32 ServerContextAreaGpadlHandle;


/*
Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/staging/hv/include/VmbusChannelInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* At the center of the Channel Management library is the Channel Offer. This
* struct contains the fundamental information about an offer.
*/
typedef struct {
struct vmbus_channel_offer {
struct hv_guid InterfaceType;
struct hv_guid InterfaceInstance;
u64 InterruptLatencyIn100nsUnits;
Expand Down Expand Up @@ -75,9 +75,7 @@ typedef struct {
} Pipe;
} u;
u32 Padding;
} __attribute__((packed)) VMBUS_CHANNEL_OFFER, *PVMBUS_CHANNEL_OFFER;

typedef u32 GPADL_HANDLE;
} __attribute__((packed));

/* Server Flags */
#define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE 1
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/hv/include/nvspprotocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ typedef struct _NVSP_1_MESSAGE_SEND_NDIS_VERSION

typedef struct _NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER
{
GPADL_HANDLE GpadlHandle;
u32 GpadlHandle;
u16 Id;
} NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER, *PNVSP_1_MESSAGE_SEND_RECEIVE_BUFFER;

Expand Down Expand Up @@ -202,7 +202,7 @@ typedef struct _NVSP_1_MESSAGE_REVOKE_RECEIVE_BUFFER

typedef struct _NVSP_1_MESSAGE_SEND_SEND_BUFFER
{
GPADL_HANDLE GpadlHandle;
u32 GpadlHandle;
u16 Id;
} NVSP_1_MESSAGE_SEND_SEND_BUFFER, *PNVSP_1_MESSAGE_SEND_SEND_BUFFER;

Expand Down

0 comments on commit 8f623c8

Please sign in to comment.