---

yaml --- r: 205591 b: refs/heads/master c: 800acdb h: refs/heads/master i: 205589: 1911ec8 205587: 72aba79 205583: 8aae31f v: v3
git-mirror · Jun 18, 2010 · 7aa563b · 7aa563b
1 parent eaf68f1
commit 7aa563b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c9824e124f67c2590e1dbd33045603c36168609
+refs/heads/master: 800acdbdf83efe6a2b4dbe61e3ab676b5c99d153
diff --git a/trunk/drivers/staging/vt6655/ttype.h b/trunk/drivers/staging/vt6655/ttype.h
@@ -68,7 +68,6 @@ typedef int             BOOL;
  * but it doesn't matter if they're signed or unsigned.
  */
 
-typedef unsigned short  USHORT;
 typedef unsigned int    UINT;
 typedef unsigned long   ULONG;
 typedef unsigned long long	ULONGLONG; //64 bit

diff --git a/trunk/drivers/staging/vt6655/wmgr.h b/trunk/drivers/staging/vt6655/wmgr.h
@@ -91,26 +91,26 @@ typedef void (*TimerFunction)(ULONG);
 typedef unsigned char NDIS_802_11_MAC_ADDRESS[6];
 typedef struct _NDIS_802_11_AI_REQFI
 {
-    USHORT Capabilities;
-    USHORT ListenInterval;
+    unsigned short Capabilities;
+    unsigned short ListenInterval;
     NDIS_802_11_MAC_ADDRESS  CurrentAPAddress;
 } NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
 
 typedef struct _NDIS_802_11_AI_RESFI
 {
-    USHORT Capabilities;
-    USHORT StatusCode;
-    USHORT AssociationId;
+    unsigned short Capabilities;
+    unsigned short StatusCode;
+    unsigned short AssociationId;
 } NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
 
 typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
 {
     ULONG                   Length;
-    USHORT                  AvailableRequestFixedIEs;
+    unsigned short          AvailableRequestFixedIEs;
     NDIS_802_11_AI_REQFI    RequestFixedIEs;
     ULONG                   RequestIELength;
     ULONG                   OffsetRequestIEs;
-    USHORT                  AvailableResponseFixedIEs;
+    unsigned short          AvailableResponseFixedIEs;
     NDIS_802_11_AI_RESFI    ResponseFixedIEs;
     ULONG                   ResponseIELength;
     ULONG                   OffsetResponseIEs;