aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/RndisFilter.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-07-14 18:09:36 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:01:46 -0400
commit4d64311468a90d4ab1e83c62d63b27da598b73ea (patch)
tree958df2af78911f7f6d66040f7fbcd965a1cbd4b6 /drivers/staging/hv/RndisFilter.c
parent5cd508bc3ac032343e6853cd5712ac392942fb2c (diff)
Staging: hv: remove UINT32 and INT32 typedefs
The UINT32 and INT32 typedefs are now removed from the Hyper-V driver code. Cc: Hank Janssen <hjanssen@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/RndisFilter.c')
-rw-r--r--drivers/staging/hv/RndisFilter.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c
index 6d9ca8d46e5..ee56e0a621b 100644
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -50,8 +50,8 @@ typedef struct _RNDIS_DEVICE {
50 NETVSC_DEVICE *NetDevice; 50 NETVSC_DEVICE *NetDevice;
51 51
52 RNDIS_DEVICE_STATE State; 52 RNDIS_DEVICE_STATE State;
53 UINT32 LinkStatus; 53 u32 LinkStatus;
54 UINT32 NewRequestId; 54 u32 NewRequestId;
55 55
56 HANDLE RequestLock; 56 HANDLE RequestLock;
57 LIST_ENTRY RequestList; 57 LIST_ENTRY RequestList;
@@ -120,9 +120,9 @@ RndisFilterOnReceive(
120static int 120static int
121RndisFilterQueryDevice( 121RndisFilterQueryDevice(
122 RNDIS_DEVICE *Device, 122 RNDIS_DEVICE *Device,
123 UINT32 Oid, 123 u32 Oid,
124 void *Result, 124 void *Result,
125 UINT32 *ResultSize 125 u32 *ResultSize
126 ); 126 );
127 127
128static inline int 128static inline int
@@ -138,7 +138,7 @@ RndisFilterQueryDeviceLinkStatus(
138static int 138static int
139RndisFilterSetPacketFilter( 139RndisFilterSetPacketFilter(
140 RNDIS_DEVICE *Device, 140 RNDIS_DEVICE *Device,
141 UINT32 NewFilter 141 u32 NewFilter
142 ); 142 );
143 143
144static int 144static int
@@ -235,7 +235,7 @@ static inline void PutRndisDevice(RNDIS_DEVICE *Device)
235 MemFree(Device); 235 MemFree(Device);
236} 236}
237 237
238static inline RNDIS_REQUEST* GetRndisRequest(RNDIS_DEVICE *Device, UINT32 MessageType, UINT32 MessageLength) 238static inline RNDIS_REQUEST* GetRndisRequest(RNDIS_DEVICE *Device, u32 MessageType, u32 MessageLength)
239{ 239{
240 RNDIS_REQUEST *request; 240 RNDIS_REQUEST *request;
241 RNDIS_MESSAGE *rndisMessage; 241 RNDIS_MESSAGE *rndisMessage;
@@ -465,7 +465,7 @@ RndisFilterReceiveData(
465 ) 465 )
466{ 466{
467 RNDIS_PACKET *rndisPacket; 467 RNDIS_PACKET *rndisPacket;
468 UINT32 dataOffset; 468 u32 dataOffset;
469 469
470 DPRINT_ENTER(NETVSC); 470 DPRINT_ENTER(NETVSC);
471 471
@@ -585,13 +585,13 @@ RndisFilterOnReceive(
585static int 585static int
586RndisFilterQueryDevice( 586RndisFilterQueryDevice(
587 RNDIS_DEVICE *Device, 587 RNDIS_DEVICE *Device,
588 UINT32 Oid, 588 u32 Oid,
589 void *Result, 589 void *Result,
590 UINT32 *ResultSize 590 u32 *ResultSize
591 ) 591 )
592{ 592{
593 RNDIS_REQUEST *request; 593 RNDIS_REQUEST *request;
594 UINT32 inresultSize = *ResultSize; 594 u32 inresultSize = *ResultSize;
595 RNDIS_QUERY_REQUEST *query; 595 RNDIS_QUERY_REQUEST *query;
596 RNDIS_QUERY_COMPLETE *queryComplete; 596 RNDIS_QUERY_COMPLETE *queryComplete;
597 int ret=0; 597 int ret=0;
@@ -653,7 +653,7 @@ RndisFilterQueryDeviceMac(
653 RNDIS_DEVICE *Device 653 RNDIS_DEVICE *Device
654 ) 654 )
655{ 655{
656 UINT32 size=HW_MACADDR_LEN; 656 u32 size=HW_MACADDR_LEN;
657 657
658 return RndisFilterQueryDevice(Device, 658 return RndisFilterQueryDevice(Device,
659 RNDIS_OID_802_3_PERMANENT_ADDRESS, 659 RNDIS_OID_802_3_PERMANENT_ADDRESS,
@@ -666,7 +666,7 @@ RndisFilterQueryDeviceLinkStatus(
666 RNDIS_DEVICE *Device 666 RNDIS_DEVICE *Device
667 ) 667 )
668{ 668{
669 UINT32 size=sizeof(UINT32); 669 u32 size=sizeof(u32);
670 670
671 return RndisFilterQueryDevice(Device, 671 return RndisFilterQueryDevice(Device,
672 RNDIS_OID_GEN_MEDIA_CONNECT_STATUS, 672 RNDIS_OID_GEN_MEDIA_CONNECT_STATUS,
@@ -677,20 +677,20 @@ RndisFilterQueryDeviceLinkStatus(
677static int 677static int
678RndisFilterSetPacketFilter( 678RndisFilterSetPacketFilter(
679 RNDIS_DEVICE *Device, 679 RNDIS_DEVICE *Device,
680 UINT32 NewFilter 680 u32 NewFilter
681 ) 681 )
682{ 682{
683 RNDIS_REQUEST *request; 683 RNDIS_REQUEST *request;
684 RNDIS_SET_REQUEST *set; 684 RNDIS_SET_REQUEST *set;
685 RNDIS_SET_COMPLETE *setComplete; 685 RNDIS_SET_COMPLETE *setComplete;
686 UINT32 status; 686 u32 status;
687 int ret; 687 int ret;
688 688
689 DPRINT_ENTER(NETVSC); 689 DPRINT_ENTER(NETVSC);
690 690
691 ASSERT(RNDIS_MESSAGE_SIZE(RNDIS_SET_REQUEST) + sizeof(UINT32) <= sizeof(RNDIS_MESSAGE)); 691 ASSERT(RNDIS_MESSAGE_SIZE(RNDIS_SET_REQUEST) + sizeof(u32) <= sizeof(RNDIS_MESSAGE));
692 692
693 request = GetRndisRequest(Device, REMOTE_NDIS_SET_MSG, RNDIS_MESSAGE_SIZE(RNDIS_SET_REQUEST) + sizeof(UINT32)); 693 request = GetRndisRequest(Device, REMOTE_NDIS_SET_MSG, RNDIS_MESSAGE_SIZE(RNDIS_SET_REQUEST) + sizeof(u32));
694 if (!request) 694 if (!request)
695 { 695 {
696 ret = -1; 696 ret = -1;
@@ -700,10 +700,10 @@ RndisFilterSetPacketFilter(
700 // Setup the rndis set 700 // Setup the rndis set
701 set = &request->RequestMessage.Message.SetRequest; 701 set = &request->RequestMessage.Message.SetRequest;
702 set->Oid = RNDIS_OID_GEN_CURRENT_PACKET_FILTER; 702 set->Oid = RNDIS_OID_GEN_CURRENT_PACKET_FILTER;
703 set->InformationBufferLength = sizeof(UINT32); 703 set->InformationBufferLength = sizeof(u32);
704 set->InformationBufferOffset = sizeof(RNDIS_SET_REQUEST); 704 set->InformationBufferOffset = sizeof(RNDIS_SET_REQUEST);
705 705
706 memcpy((void*)(ULONG_PTR)set + sizeof(RNDIS_SET_REQUEST), &NewFilter, sizeof(UINT32)); 706 memcpy((void*)(ULONG_PTR)set + sizeof(RNDIS_SET_REQUEST), &NewFilter, sizeof(u32));
707 707
708 ret = RndisFilterSendRequest(Device, request); 708 ret = RndisFilterSendRequest(Device, request);
709 if (ret != 0) 709 if (ret != 0)
@@ -795,7 +795,7 @@ RndisFilterInitDevice(
795 RNDIS_REQUEST *request; 795 RNDIS_REQUEST *request;
796 RNDIS_INITIALIZE_REQUEST *init; 796 RNDIS_INITIALIZE_REQUEST *init;
797 RNDIS_INITIALIZE_COMPLETE *initComplete; 797 RNDIS_INITIALIZE_COMPLETE *initComplete;
798 UINT32 status; 798 u32 status;
799 int ret; 799 int ret;
800 800
801 DPRINT_ENTER(NETVSC); 801 DPRINT_ENTER(NETVSC);
@@ -1091,7 +1091,7 @@ RndisFilterOnSend(
1091 RNDIS_FILTER_PACKET *filterPacket; 1091 RNDIS_FILTER_PACKET *filterPacket;
1092 RNDIS_MESSAGE *rndisMessage; 1092 RNDIS_MESSAGE *rndisMessage;
1093 RNDIS_PACKET *rndisPacket; 1093 RNDIS_PACKET *rndisPacket;
1094 UINT32 rndisMessageSize; 1094 u32 rndisMessageSize;
1095 1095
1096 DPRINT_ENTER(NETVSC); 1096 DPRINT_ENTER(NETVSC);
1097 1097