summaryrefslogtreecommitdiff
path: root/drivers/staging/vt6655/wmgr.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/vt6655/wmgr.h')
-rw-r--r--drivers/staging/vt6655/wmgr.h33
1 files changed, 7 insertions, 26 deletions
diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h
index 5b526ab2d912..1c1f2ea5782c 100644
--- a/drivers/staging/vt6655/wmgr.h
+++ b/drivers/staging/vt6655/wmgr.h
@@ -31,36 +31,17 @@
*
*/
-
#ifndef __WMGR_H__
#define __WMGR_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__80211MGR_H__)
#include "80211mgr.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-#if !defined(__WCMD_H__)
#include "wcmd.h"
-#endif
-#if !defined(__BSSDB_H__)
#include "bssdb.h"
-#endif
-#if !defined(__CARD_H__)
-#include "card.h"
-#endif
-#if !defined(__WPA2_H__)
#include "wpa2.h"
-#endif
-#if !defined(__VNTWIFI_H__)
#include "vntwifi.h"
-#endif
-
-
+#include "card.h"
/*--------------------- Export Definitions -------------------------*/
@@ -143,7 +124,7 @@ typedef struct tagSAssocInfo {
// store ReqIEs set by OID_802_11_ASSOCIATION_INFORMATION
ULONG RequestIELength;
BYTE abyReqIEs[WLAN_BEACON_FR_MAXLEN];
-} SAssocInfo, DEF* PSAssocInfo;
+} SAssocInfo, *PSAssocInfo;
//---
@@ -246,7 +227,7 @@ typedef struct tagSTxMgmtPacket {
UINT cbMPDULen;
UINT cbPayloadLen;
-} STxMgmtPacket, DEF* PSTxMgmtPacket;
+} STxMgmtPacket, *PSTxMgmtPacket;
// Rx Managment Packet descriptor
@@ -261,7 +242,7 @@ typedef struct tagSRxMgmtPacket {
BYTE byRxRate;
BYTE byRxChannel;
-} SRxMgmtPacket, DEF* PSRxMgmtPacket;
+} SRxMgmtPacket, *PSRxMgmtPacket;
@@ -356,11 +337,11 @@ typedef struct tagSMgmtObject
BOOL bRxBeaconInTBTTWake;
BYTE abyPSTxMap[MAX_NODE_NUM + 1];
- // managment command related
+ // management command related
UINT uCmdBusy;
UINT uCmdHostAPBusy;
- // managment packet pool
+ // management packet pool
PBYTE pbyMgmtPacketPool;
BYTE byMgmtPacketPool[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
@@ -409,7 +390,7 @@ typedef struct tagSMgmtObject
struct sk_buff skb;
-} SMgmtObject, DEF *PSMgmtObject;
+} SMgmtObject, *PSMgmtObject;
/*--------------------- Export Macros ------------------------------*/