Commit 3fcc523a authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: hv: remove VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER typedef

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0cf4fa80
...@@ -912,7 +912,7 @@ VmbusChannelSendPacketMultiPageBuffer( ...@@ -912,7 +912,7 @@ VmbusChannelSendPacketMultiPageBuffer(
) )
{ {
int ret=0; int ret=0;
VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER desc; struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER desc;
u32 descSize; u32 descSize;
u32 packetLen; u32 packetLen;
u32 packetLenAligned; u32 packetLenAligned;
...@@ -930,7 +930,7 @@ VmbusChannelSendPacketMultiPageBuffer( ...@@ -930,7 +930,7 @@ VmbusChannelSendPacketMultiPageBuffer(
ASSERT(PfnCount <= MAX_MULTIPAGE_BUFFER_COUNT); ASSERT(PfnCount <= MAX_MULTIPAGE_BUFFER_COUNT);
/* Adjust the size down since VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER is the largest size we support */ /* Adjust the size down since VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER is the largest size we support */
descSize = sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER) - ((MAX_MULTIPAGE_BUFFER_COUNT - PfnCount)*sizeof(u64)); descSize = sizeof(struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER) - ((MAX_MULTIPAGE_BUFFER_COUNT - PfnCount)*sizeof(u64));
packetLen = descSize + BufferLen; packetLen = descSize + BufferLen;
packetLenAligned = ALIGN_UP(packetLen, sizeof(u64)); packetLenAligned = ALIGN_UP(packetLen, sizeof(u64));
......
...@@ -45,7 +45,7 @@ struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER { ...@@ -45,7 +45,7 @@ struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER {
/* The format must be the same as VMDATA_GPA_DIRECT */ /* The format must be the same as VMDATA_GPA_DIRECT */
typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER { struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
u16 Type; u16 Type;
u16 DataOffset8; u16 DataOffset8;
u16 Length8; u16 Length8;
...@@ -54,7 +54,7 @@ typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER { ...@@ -54,7 +54,7 @@ typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
u32 Reserved; u32 Reserved;
u32 RangeCount; /* Always 1 in this case */ u32 RangeCount; /* Always 1 in this case */
MULTIPAGE_BUFFER Range; MULTIPAGE_BUFFER Range;
} VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER; };
#pragma pack(pop) #pragma pack(pop)
......
...@@ -126,7 +126,7 @@ VmbusInitialize( ...@@ -126,7 +126,7 @@ VmbusInitialize(
DPRINT_INFO(VMBUS, "+++++++ Vmbus using SINT %d +++++++", VMBUS_MESSAGE_SINT); DPRINT_INFO(VMBUS, "+++++++ Vmbus using SINT %d +++++++", VMBUS_MESSAGE_SINT);
DPRINT_DBG(VMBUS, "sizeof(VMBUS_CHANNEL_PACKET_PAGE_BUFFER)=%ld, sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)=%ld", DPRINT_DBG(VMBUS, "sizeof(VMBUS_CHANNEL_PACKET_PAGE_BUFFER)=%ld, sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)=%ld",
sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)); sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER));
drv->name = gDriverName; drv->name = gDriverName;
memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(GUID)); memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(GUID));
......
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