From caf26a31b51a148f70113700fd4f9860b5da3931 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Aug 2009 16:17:03 -0700 Subject: Staging: hv: osd.h: remove GUID typedef GUID should not be a typedef. As proof of the problem of typedefs, look, we are passing 2 of these as a value in functions! Bah... Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/NetVsc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'drivers/staging/hv/NetVsc.c') diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c index 0389ef7bedb..4594277f555 100644 --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c @@ -34,8 +34,11 @@ static const char* gDriverName="netvsc"; /* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */ -static const GUID gNetVscDeviceType={ - .Data = {0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46, 0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E} +static const struct hv_guid gNetVscDeviceType = { + .data = { + 0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46, + 0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E + } }; @@ -240,7 +243,7 @@ NetVscInitialize( ASSERT(driver->RingBufferSize >= (PAGE_SIZE << 1)); drv->name = gDriverName; - memcpy(&drv->deviceType, &gNetVscDeviceType, sizeof(GUID)); + memcpy(&drv->deviceType, &gNetVscDeviceType, sizeof(struct hv_guid)); /* Make sure it is set by the caller */ ASSERT(driver->OnReceiveCallback); -- cgit v1.2.3