aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/vt6656/80211hdr.h5
-rw-r--r--drivers/staging/vt6656/80211mgr.c16
-rw-r--r--drivers/staging/vt6656/80211mgr.h6
-rw-r--r--drivers/staging/vt6656/TODO2
-rw-r--r--drivers/staging/vt6656/aes_ccmp.c7
-rw-r--r--drivers/staging/vt6656/aes_ccmp.h2
-rw-r--r--drivers/staging/vt6656/baseband.c23
-rw-r--r--drivers/staging/vt6656/baseband.h17
-rw-r--r--drivers/staging/vt6656/bssdb.c45
-rw-r--r--drivers/staging/vt6656/bssdb.h11
-rw-r--r--drivers/staging/vt6656/card.c32
-rw-r--r--drivers/staging/vt6656/card.h14
-rw-r--r--drivers/staging/vt6656/channel.c9
-rw-r--r--drivers/staging/vt6656/channel.h3
-rw-r--r--drivers/staging/vt6656/control.c6
-rw-r--r--drivers/staging/vt6656/control.h20
-rw-r--r--drivers/staging/vt6656/datarate.c21
-rw-r--r--drivers/staging/vt6656/desc.h10
-rw-r--r--drivers/staging/vt6656/dpc.c40
-rw-r--r--drivers/staging/vt6656/dpc.h24
-rw-r--r--drivers/staging/vt6656/firmware.c10
-rw-r--r--drivers/staging/vt6656/firmware.h6
-rw-r--r--drivers/staging/vt6656/hostap.c20
-rw-r--r--drivers/staging/vt6656/hostap.h16
-rw-r--r--drivers/staging/vt6656/int.c19
-rw-r--r--drivers/staging/vt6656/int.h18
-rw-r--r--drivers/staging/vt6656/iocmd.h3
-rw-r--r--drivers/staging/vt6656/ioctl.c22
-rw-r--r--drivers/staging/vt6656/ioctl.h17
-rw-r--r--drivers/staging/vt6656/iowpa.h1
-rw-r--r--drivers/staging/vt6656/iwctl.c23
-rw-r--r--drivers/staging/vt6656/iwctl.h17
-rw-r--r--drivers/staging/vt6656/kcompat.h1
-rw-r--r--drivers/staging/vt6656/key.c15
-rw-r--r--drivers/staging/vt6656/key.h19
-rw-r--r--drivers/staging/vt6656/mac.c19
-rw-r--r--drivers/staging/vt6656/mac.h15
-rw-r--r--drivers/staging/vt6656/main_usb.c60
-rw-r--r--drivers/staging/vt6656/mib.c17
-rw-r--r--drivers/staging/vt6656/mib.h22
-rw-r--r--drivers/staging/vt6656/michael.c6
-rw-r--r--drivers/staging/vt6656/michael.h4
-rw-r--r--drivers/staging/vt6656/power.c31
-rw-r--r--drivers/staging/vt6656/rc4.c2
-rw-r--r--drivers/staging/vt6656/rc4.h4
-rw-r--r--drivers/staging/vt6656/rf.c12
-rw-r--r--drivers/staging/vt6656/rf.h14
-rw-r--r--drivers/staging/vt6656/rxtx.c38
-rw-r--r--drivers/staging/vt6656/rxtx.h22
-rw-r--r--drivers/staging/vt6656/srom.h17
-rw-r--r--drivers/staging/vt6656/tbit.h5
-rw-r--r--drivers/staging/vt6656/tcrc.c8
-rw-r--r--drivers/staging/vt6656/tcrc.h18
-rw-r--r--drivers/staging/vt6656/tether.c13
-rw-r--r--drivers/staging/vt6656/tether.h20
-rw-r--r--drivers/staging/vt6656/tkip.c10
-rw-r--r--drivers/staging/vt6656/tkip.h16
-rw-r--r--drivers/staging/vt6656/tmacro.h3
-rw-r--r--drivers/staging/vt6656/tpci.h6
-rw-r--r--drivers/staging/vt6656/umem.h4
-rw-r--r--drivers/staging/vt6656/upc.h5
-rw-r--r--drivers/staging/vt6656/usbpipe.c15
-rw-r--r--drivers/staging/vt6656/usbpipe.h17
-rw-r--r--drivers/staging/vt6656/wcmd.c42
-rw-r--r--drivers/staging/vt6656/wcmd.h6
-rw-r--r--drivers/staging/vt6656/wctl.c9
-rw-r--r--drivers/staging/vt6656/wctl.h19
-rw-r--r--drivers/staging/vt6656/wmgr.c44
-rw-r--r--drivers/staging/vt6656/wmgr.h17
-rw-r--r--drivers/staging/vt6656/wpa.c22
-rw-r--r--drivers/staging/vt6656/wpa.h14
-rw-r--r--drivers/staging/vt6656/wpa2.c10
-rw-r--r--drivers/staging/vt6656/wpa2.h21
-rw-r--r--drivers/staging/vt6656/wpactl.c22
-rw-r--r--drivers/staging/vt6656/wpactl.h18
75 files changed, 10 insertions, 1177 deletions
diff --git a/drivers/staging/vt6656/80211hdr.h b/drivers/staging/vt6656/80211hdr.h
index 84cb1d020cb..e5cee6fd053 100644
--- a/drivers/staging/vt6656/80211hdr.h
+++ b/drivers/staging/vt6656/80211hdr.h
@@ -28,15 +28,10 @@
*
*/
-
-
#ifndef __80211HDR_H__
#define __80211HDR_H__
-
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
/*--------------------- Export Definitions -------------------------*/
// bit type
diff --git a/drivers/staging/vt6656/80211mgr.c b/drivers/staging/vt6656/80211mgr.c
index 8b1ffe9f240..8fa1a8e5a21 100644
--- a/drivers/staging/vt6656/80211mgr.c
+++ b/drivers/staging/vt6656/80211mgr.c
@@ -52,28 +52,12 @@
*
*/
-
-
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__80211MGR_H__)
#include "80211mgr.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__WPA_H__)
#include "wpa.h"
-#endif
-
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/80211mgr.h b/drivers/staging/vt6656/80211mgr.h
index d94bfb9e8b1..a4ea8249216 100644
--- a/drivers/staging/vt6656/80211mgr.h
+++ b/drivers/staging/vt6656/80211mgr.h
@@ -28,17 +28,11 @@
*
*/
-
#ifndef __80211MGR_H__
#define __80211MGR_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/TODO b/drivers/staging/vt6656/TODO
index fc669194043..17cf50c6735 100644
--- a/drivers/staging/vt6656/TODO
+++ b/drivers/staging/vt6656/TODO
@@ -1,5 +1,5 @@
TODO:
-- remove __cplusplus ifdefs
+- remove __cplusplus ifdefs -- done
- remove kernel version compatibility wrappers
- remove support for older wireless extensions
- prepare for merge with vt6655 driver:
diff --git a/drivers/staging/vt6656/aes_ccmp.c b/drivers/staging/vt6656/aes_ccmp.c
index 59cc018d48a..e79a0d16428 100644
--- a/drivers/staging/vt6656/aes_ccmp.c
+++ b/drivers/staging/vt6656/aes_ccmp.c
@@ -33,16 +33,9 @@
*
*/
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/aes_ccmp.h b/drivers/staging/vt6656/aes_ccmp.h
index 2b1920f2860..f2ba1d5aa1e 100644
--- a/drivers/staging/vt6656/aes_ccmp.h
+++ b/drivers/staging/vt6656/aes_ccmp.h
@@ -30,9 +30,7 @@
#ifndef __AES_H__
#define __AES_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 7057d3e3317..c5430d99b5f 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -37,40 +37,17 @@
*
*/
-
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__SROM_H__)
#include "srom.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h
index 9cad837aa7e..e991a7e68d4 100644
--- a/drivers/staging/vt6656/baseband.h
+++ b/drivers/staging/vt6656/baseband.h
@@ -33,18 +33,9 @@
#ifndef __BASEBAND_H__
#define __BASEBAND_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
@@ -104,9 +95,6 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
UINT
BBuGetFrameTime(
@@ -155,9 +143,4 @@ VOID BBvUpdatePreEDThreshold(
IN BOOL bScanning
);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
#endif // __BASEBAND_H__
diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c
index 3b8e38d7907..ef9431eb9c2 100644
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -39,72 +39,27 @@
*
*/
-
-
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-#if !defined(__BSSDB_H__)
#include "bssdb.h"
-#endif
-#if !defined(__WMGR_H__)
#include "wmgr.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
-#if !defined(__DESC_H__)
#include "desc.h"
-#endif
-#if !defined(__WCMD_H__)
#include "wcmd.h"
-#endif
-#if !defined(__WPA_H__)
#include "wpa.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__WPA2_H__)
#include "wpa2.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-//DavidWang
-#if !defined(__IOWPA_H__)
#include "iowpa.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h
index b9bd1fb436c..f365b6b8bf6 100644
--- a/drivers/staging/vt6656/bssdb.h
+++ b/drivers/staging/vt6656/bssdb.h
@@ -30,22 +30,11 @@
#ifndef __BSSDB_H__
#define __BSSDB_H__
-
#include <linux/skbuff.h>
-
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-#if !defined(__80211MGR_H__)
#include "80211mgr.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__MIB_H__)
#include "mib.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index f1f5f35aa8e..9900ed41d5a 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -45,53 +45,21 @@
*
*/
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__DESC_H__)
#include "desc.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__POWER_H__)
#include "power.h"
-#endif
-#if !defined(__KEY_H__)
#include "key.h"
-#endif
-#if !defined(__RC4_H__)
#include "rc4.h"
-#endif
-#if !defined(__COUNTRY_H__)
#include "country.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 572db6ce8a7..aa90c2cb446 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -26,14 +26,10 @@
*
*/
-
#ifndef __CARD_H__
#define __CARD_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
@@ -66,10 +62,6 @@ typedef enum _CARD_OP_MODE {
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
BOOL CARDbSetMediaChannel(PVOID pDeviceHandler, UINT uConnectionChannel);
void CARDvSetRSPINF(PVOID pDeviceHandler, BYTE byBBType);
@@ -97,12 +89,6 @@ CARDbChannelSwitch (
IN BYTE byCount
);
-
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
#endif // __CARD_H__
diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index 56308b0df5c..4c688265e86 100644
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
@@ -34,19 +34,10 @@
*
*/
-#if !defined (_COUNTRY_H_)
#include "country.h"
-#endif
-#if !defined (_CHANNEL_H_)
#include "channel.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-
/*--------------------- Static Definitions -------------------------*/
static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/channel.h b/drivers/staging/vt6656/channel.h
index 972df7d1726..2306b202565 100644
--- a/drivers/staging/vt6656/channel.h
+++ b/drivers/staging/vt6656/channel.h
@@ -30,9 +30,7 @@
#ifndef _CHANNEL_H_
#define _CHANNEL_H_
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
/*--------------------- Export Definitions -------------------------*/
@@ -55,4 +53,5 @@ CHvChannelGetList (
IN UINT uCountryCodeIdx,
OUT PBYTE pbyChannelTable
);
+
#endif /* _REGULATE_H_ */
diff --git a/drivers/staging/vt6656/control.c b/drivers/staging/vt6656/control.c
index ee541256cf9..1f7cb47a874 100644
--- a/drivers/staging/vt6656/control.c
+++ b/drivers/staging/vt6656/control.c
@@ -38,15 +38,9 @@
*
*/
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/control.h b/drivers/staging/vt6656/control.h
index c208eb508e8..4d9a777a706 100644
--- a/drivers/staging/vt6656/control.h
+++ b/drivers/staging/vt6656/control.h
@@ -27,21 +27,12 @@
*
*/
-
#ifndef __CONTROL_H__
#define __CONTROL_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__USBPIPE_H__)
#include "usbpipe.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
@@ -61,10 +52,6 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
void ControlvWriteByte(
IN PSDevice pDevice,
@@ -90,13 +77,6 @@ void ControlvMaskByte(
IN BYTE byData
);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __RCV_H__
diff --git a/drivers/staging/vt6656/datarate.c b/drivers/staging/vt6656/datarate.c
index ad1ed508422..968feb466b0 100644
--- a/drivers/staging/vt6656/datarate.c
+++ b/drivers/staging/vt6656/datarate.c
@@ -33,36 +33,17 @@
*
*/
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__80211MGR_H__)
#include "80211mgr.h"
-#endif
-#if !defined(__BSSDB_H__)
#include "bssdb.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__SROM_H__)
#include "srom.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
+
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/desc.h b/drivers/staging/vt6656/desc.h
index 3030e78872b..f10530fcc99 100644
--- a/drivers/staging/vt6656/desc.h
+++ b/drivers/staging/vt6656/desc.h
@@ -28,23 +28,13 @@
*
*/
-
#ifndef __DESC_H__
#define __DESC_H__
#include <linux/types.h>
#include <linux/mm.h>
-
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-
-
-
-
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 811fecb1706..b6deacec0c3 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -38,65 +38,25 @@
*
*/
-
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__RXTX_H__)
#include "rxtx.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__BSSDB_H__)
#include "bssdb.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__MICHAEL_H__)
#include "michael.h"
-#endif
-#if !defined(__TKIP_H__)
#include "tkip.h"
-#endif
-#if !defined(__TCRC_H__)
#include "tcrc.h"
-#endif
-#if !defined(__WCTL_H__)
#include "wctl.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__HOSTAP_H__)
#include "hostap.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__IOWPA_H__)
#include "iowpa.h"
-#endif
-#if !defined(__AES_H__)
#include "aes_ccmp.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
-#if !defined(__USBPIPE_H__)
#include "usbpipe.h"
-#endif
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/dpc.h b/drivers/staging/vt6656/dpc.h
index eb4677f15fe..df148b45396 100644
--- a/drivers/staging/vt6656/dpc.h
+++ b/drivers/staging/vt6656/dpc.h
@@ -26,20 +26,12 @@
*
*/
-
#ifndef __DPC_H__
#define __DPC_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__WCMD_H__)
#include "wcmd.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
@@ -49,14 +41,6 @@
/*--------------------- Export Functions --------------------------*/
-
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
-
-
-
VOID
RXvWorkItem(
PVOID Context
@@ -80,14 +64,6 @@ RXbBulkInProcessData(
IN ULONG BytesToIndicate
);
-
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __RXTX_H__
diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c
index 4a524e3c15c..b592807513e 100644
--- a/drivers/staging/vt6656/firmware.c
+++ b/drivers/staging/vt6656/firmware.c
@@ -31,20 +31,10 @@
*
*/
-
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__FIRMWARE_H__)
#include "firmware.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/firmware.h b/drivers/staging/vt6656/firmware.h
index fdc380af59e..97f8559f2a5 100644
--- a/drivers/staging/vt6656/firmware.h
+++ b/drivers/staging/vt6656/firmware.h
@@ -27,17 +27,11 @@
*
*/
-
#ifndef __FIRMWARE_H__
#define __FIRMWARE_H__
-
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
index 02743a62b8f..0c8267a1007 100644
--- a/drivers/staging/vt6656/hostap.c
+++ b/drivers/staging/vt6656/hostap.c
@@ -30,35 +30,15 @@
*
*/
-
-#if !defined(__HOSTAP_H__)
#include "hostap.h"
-#endif
-#if !defined(__IOCMD_H__)
#include "iocmd.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__WPACTL_H__)
#include "wpactl.h"
-#endif
-#if !defined(__KEY_H__)
#include "key.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
-
#define VIAWGET_HOSTAPD_MAX_BUF_SIZE 1024
#define HOSTAP_CRYPT_FLAG_SET_TX_KEY BIT0
diff --git a/drivers/staging/vt6656/hostap.h b/drivers/staging/vt6656/hostap.h
index c5ad3494b6e..8fd667b542b 100644
--- a/drivers/staging/vt6656/hostap.h
+++ b/drivers/staging/vt6656/hostap.h
@@ -26,14 +26,10 @@
*
*/
-
#ifndef __HOSTAP_H__
#define __HOSTAP_H__
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
@@ -57,11 +53,6 @@
/*--------------------- Export Functions --------------------------*/
-
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
#ifndef ETH_P_PAE
#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
#endif /* ETH_P_PAE */
@@ -73,13 +64,6 @@ extern "C" { /* Assume C declarations for C++ */
int hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked);
int hostap_ioctl(PSDevice pDevice, struct iw_point *p);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __HOSTAP_H__
diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 158a4cc0e90..f9c64ccaa1b 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -32,34 +32,15 @@
*
*/
-
-#if !defined(__INT_H__)
#include "int.h"
-#endif
-#if !defined(__MIB_H__)
#include "mib.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__POWER_H__)
#include "power.h"
-#endif
-#if !defined(__BSSDB_H__)
#include "bssdb.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__USBPIPE_H__)
#include "usbpipe.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG;
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
index 4857fce99c1..15e815a3596 100644
--- a/drivers/staging/vt6656/int.h
+++ b/drivers/staging/vt6656/int.h
@@ -27,18 +27,11 @@
*
*/
-
#ifndef __INT_H__
#define __INT_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
#pragma pack(1)
@@ -73,9 +66,6 @@ SINTData, *PSINTData;
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
VOID
INTvWorkItem(
@@ -87,14 +77,6 @@ INTnsProcessData(
IN PSDevice pDevice
);
-
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __INT_H__
diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h
index e6090b5785f..49bfe15f133 100644
--- a/drivers/staging/vt6656/iocmd.h
+++ b/drivers/staging/vt6656/iocmd.h
@@ -29,10 +29,7 @@
#ifndef __IOCMD_H__
#define __IOCMD_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c
index 8e9762b8cf4..326d7eef954 100644
--- a/drivers/staging/vt6656/ioctl.c
+++ b/drivers/staging/vt6656/ioctl.c
@@ -30,38 +30,16 @@
*
*/
-
-#if !defined(__IOCTL_H__)
#include "ioctl.h"
-#endif
-#if !defined(__IOCMD_H__)
#include "iocmd.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__HOSTAP_H__)
#include "hostap.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__WPACTL_H__)
#include "wpactl.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/ioctl.h b/drivers/staging/vt6656/ioctl.h
index 9c6816eab46..07d228399c3 100644
--- a/drivers/staging/vt6656/ioctl.h
+++ b/drivers/staging/vt6656/ioctl.h
@@ -26,14 +26,10 @@
*
*/
-
#ifndef __IOCTL_H__
#define __IOCTL_H__
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
@@ -44,12 +40,6 @@
/*--------------------- Export Functions --------------------------*/
-
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
-
int private_ioctl(PSDevice pDevice, struct ifreq *rq);
/*
@@ -61,13 +51,6 @@ VOID vConfigWEPKey (
);
*/
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __IOCTL_H__
diff --git a/drivers/staging/vt6656/iowpa.h b/drivers/staging/vt6656/iowpa.h
index 05f391a02fa..5750b5b548e 100644
--- a/drivers/staging/vt6656/iowpa.h
+++ b/drivers/staging/vt6656/iowpa.h
@@ -29,7 +29,6 @@
#ifndef __IOWPA_H__
#define __IOWPA_H__
-
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 96f2a78994b..96c5e1aa1b0 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -30,43 +30,20 @@
*
*/
-
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__IOCTL_H__)
#include "ioctl.h"
-#endif
-#if !defined(__IOCMD_H__)
#include "iocmd.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__HOSTAP_H__)
#include "hostap.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__POWER_H__)
#include "power.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-#if !defined(__IOWPA_H__)
#include "iowpa.h"
-#endif
-#if !defined(__WPACTL_H__)
#include "wpactl.h"
#endif
-#endif
#include <net/iw_handler.h>
diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h
index 962235f2f39..3096de0ba1b 100644
--- a/drivers/staging/vt6656/iwctl.h
+++ b/drivers/staging/vt6656/iwctl.h
@@ -26,14 +26,10 @@
*
*/
-
#ifndef __IWCTL_H__
#define __IWCTL_H__
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
@@ -44,12 +40,6 @@
/*--------------------- Export Functions --------------------------*/
-
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
-
struct iw_statistics *iwctl_get_wireless_stats (struct net_device *dev);
@@ -233,13 +223,6 @@ int iwctl_siwmlme(struct net_device *dev,
extern const struct iw_handler_def iwctl_handler_def;
extern const struct iw_priv_args iwctl_private_args;
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __IWCTL_H__
diff --git a/drivers/staging/vt6656/kcompat.h b/drivers/staging/vt6656/kcompat.h
index ff44cd943f3..74ae952b57e 100644
--- a/drivers/staging/vt6656/kcompat.h
+++ b/drivers/staging/vt6656/kcompat.h
@@ -25,6 +25,7 @@
* Date: Apr 8, 2002
*
*/
+
#ifndef _KCOMPAT_H
#define _KCOMPAT_H
diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index bd0f29c2afb..717be27e20c 100644
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -36,28 +36,13 @@
*
*/
-
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__KEY_H__)
#include "key.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h
index 49fdcdbe151..b15a64cb386 100644
--- a/drivers/staging/vt6656/key.h
+++ b/drivers/staging/vt6656/key.h
@@ -27,21 +27,12 @@
*
*/
-
#ifndef __KEY_H__
#define __KEY_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-
-#if !defined(__80211MGR_H__)
#include "80211mgr.h"
-#endif
/*--------------------- Export Definitions -------------------------*/
#define MAX_GROUP_KEY 4
@@ -105,9 +96,6 @@ typedef struct tagSKeyManagement
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
VOID KeyvInitTable(PVOID pDeviceHandler, PSKeyManagement pTable);
@@ -185,12 +173,5 @@ BOOL KeybSetAllGroupKey (
BYTE byKeyDecMode
);
-
-#ifdef __cplusplus
-} /* End of extern "C" { */
-
-#endif /* __cplusplus */
-
-
#endif // __KEY_H__
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index ff83ef4afa9..fe37192a427 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -30,32 +30,15 @@
* Revision History:
*/
-
-
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__DESC_H__)
#include "desc.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__80211hdr_H__)
#include "80211hdr.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
+
/*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG;
static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index 78ba7fcd9d3..920e150e7cc 100644
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -34,18 +34,10 @@
#ifndef __MAC_H__
#define __MAC_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
/*--------------------- Export Definitions -------------------------*/
@@ -428,9 +420,6 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx);
VOID MACvWriteMultiAddr (PSDevice pDevice, UINT uByteIdx, BYTE byData);
@@ -451,8 +440,4 @@ void MACvEnableBarkerPreambleMd(PSDevice pDevice);
void MACvDisableBarkerPreambleMd(PSDevice pDevice);
void MACvWriteBeaconInterval(PSDevice pDevice, WORD wInterval);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
#endif // __MAC_H__
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 6fd894ae5c8..10e151a9590 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -46,95 +46,35 @@
*/
#undef __NO_VERSION__
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__WMGR_H__)
#include "wmgr.h"
-#endif
-#if !defined(__WCTL_H__)
#include "wctl.h"
-#endif
-#if !defined(__POWER_H__)
#include "power.h"
-#endif
-#if !defined(__WCMD_H__)
#include "wcmd.h"
-#endif
-#if !defined(__IOCMD_H__)
#include "iocmd.h"
-#endif
-#if !defined(__TCRC_H__)
#include "tcrc.h"
-#endif
-#if !defined(__RXTX_H__)
#include "rxtx.h"
-#endif
-#if !defined(__BSSDB_H__)
#include "bssdb.h"
-#endif
-#if !defined(__HOSTAP_H__)
#include "hostap.h"
-#endif
-#if !defined(__WPACTL_H__)
#include "wpactl.h"
-#endif
-#if !defined(__IOCTL_H__)
#include "ioctl.h"
-#endif
-#if !defined(__IWCTL_H__)
#include "iwctl.h"
-#endif
-#if !defined(__DPC_H__)
#include "dpc.h"
-#endif
-#if !defined(__IOCMD_H__)
#include "iocmd.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__FIRMWARE_H__)
#include "firmware.h"
-#endif
-
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined (_CHANNEL_H_)
#include "channel.h"
-#endif
-#if !defined(__INT_H__)
#include "int.h"
-#endif
-#if !defined(__IOWPA_H__)
#include "iowpa.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
//static int msglevel =MSG_LEVEL_DEBUG;
diff --git a/drivers/staging/vt6656/mib.c b/drivers/staging/vt6656/mib.c
index 35b6c2be170..dfa89e70b8c 100644
--- a/drivers/staging/vt6656/mib.c
+++ b/drivers/staging/vt6656/mib.c
@@ -37,31 +37,14 @@
*
*/
-
-#if !defined(__UPC_H__)
#include "upc.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__MIB_H__)
#include "mib.h"
-#endif
-#if !defined(__WCTL_H__)
#include "wctl.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/mib.h b/drivers/staging/vt6656/mib.h
index 355c894e81a..b806b4d2971 100644
--- a/drivers/staging/vt6656/mib.h
+++ b/drivers/staging/vt6656/mib.h
@@ -29,19 +29,9 @@
#ifndef __MIB_H__
#define __MIB_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__DESC_H__)
#include "desc.h"
-#endif
-
-
-
-//#define ULONGLONG ULONG
/*--------------------- Export Definitions -------------------------*/
@@ -386,11 +376,6 @@ typedef struct tagSStatCounter {
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
-
void STAvClearAllCounter(PSStatCounter pStatistic);
@@ -432,13 +417,6 @@ STAvUpdateUSBCounter(
NTSTATUS ntStatus
);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __MIB_H__
diff --git a/drivers/staging/vt6656/michael.c b/drivers/staging/vt6656/michael.c
index 7bda4c19e90..2c8f875659d 100644
--- a/drivers/staging/vt6656/michael.c
+++ b/drivers/staging/vt6656/michael.c
@@ -39,15 +39,9 @@
*
*/
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__MICHAEL_H__)
#include "michael.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/michael.h b/drivers/staging/vt6656/michael.h
index 62a24a6083a..dcce12e5b6c 100644
--- a/drivers/staging/vt6656/michael.h
+++ b/drivers/staging/vt6656/michael.h
@@ -28,13 +28,11 @@
*
*/
-
#ifndef __MICHAEL_H__
#define __MICHAEL_H__
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
+
/*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Types ------------------------------*/
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index b522b21b743..a6d7767a1a9 100644
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -37,50 +37,19 @@
*
*/
-
-
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__WMGR_H__)
#include "wmgr.h"
-#endif
-#if !defined(__POWER_H__)
#include "power.h"
-#endif
-#if !defined(__WCMD_H__)
#include "wcmd.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__RXTX_H__)
#include "rxtx.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-
-
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/rc4.c b/drivers/staging/vt6656/rc4.c
index 5ad12a3746c..e6c61312fd2 100644
--- a/drivers/staging/vt6656/rc4.c
+++ b/drivers/staging/vt6656/rc4.c
@@ -30,9 +30,7 @@
*
*/
-#if !defined(__RC4_H__)
#include "rc4.h"
-#endif
VOID rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
{
diff --git a/drivers/staging/vt6656/rc4.h b/drivers/staging/vt6656/rc4.h
index 2344f35ae1d..bf607c9d446 100644
--- a/drivers/staging/vt6656/rc4.h
+++ b/drivers/staging/vt6656/rc4.h
@@ -30,11 +30,7 @@
#ifndef __RC4_H__
#define __RC4_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
/*--------------------- Export Types ------------------------------*/
diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index 3436d3bfb39..405c4f71b5f 100644
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -32,24 +32,12 @@
*
*/
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
static int msglevel =MSG_LEVEL_INFO;
//static int msglevel =MSG_LEVEL_DEBUG;
diff --git a/drivers/staging/vt6656/rf.h b/drivers/staging/vt6656/rf.h
index 1d7d3e3f130..55d882f78f2 100644
--- a/drivers/staging/vt6656/rf.h
+++ b/drivers/staging/vt6656/rf.h
@@ -27,16 +27,12 @@
*
*/
-
#ifndef __RF_H__
#define __RF_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
+
/*--------------------- Export Definitions -------------------------*/
//
// Baseband RF pair definition in eeprom (Bits 6..0)
@@ -66,9 +62,6 @@
/*--------------------- Export Variables --------------------------*/
extern const BYTE RFaby11aChannelIndex[200];
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
BOOL IFRFbWriteEmbeded(PSDevice pDevice, DWORD dwData);
BOOL RFbSetPower (
@@ -101,11 +94,6 @@ BOOL s_bVT3226D0_11bLoCurrentAdjust(
IN BOOL b11bMode
);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
#endif // __RF_H__
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index bde7e29a6bc..648b5db658d 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -46,64 +46,28 @@
*
*/
-
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__RXTX_H__)
#include "rxtx.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__BSSDB_H__)
#include "bssdb.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__MICHAEL_H__)
#include "michael.h"
-#endif
-#if !defined(__TKIP_H__)
#include "tkip.h"
-#endif
-#if !defined(__TCRC_H__)
#include "tcrc.h"
-#endif
-#if !defined(__WCTL_H__)
#include "wctl.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__HOSTAP_H__)
#include "hostap.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
-#if !defined(__USBPIPE_H__)
#include "usbpipe.h"
-#endif
#ifdef WPA_SM_Transtatus
-#if !defined(__IOCMD_H__)
#include "iocmd.h"
#endif
-#endif
+
/*--------------------- Static Definitions -------------------------*/
/*--------------------- Static Classes ----------------------------*/
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index fabea7f11c8..6bc22d371c1 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -26,20 +26,12 @@
*
*/
-
#ifndef __RXTX_H__
#define __RXTX_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__WCMD_H__)
#include "wcmd.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
@@ -673,13 +665,6 @@ typedef struct tagSBEACON_BUFFER
/*--------------------- Export Functions --------------------------*/
-
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
-
-
BOOL
bPacketToWirelessUsb(
IN PSDevice pDevice,
@@ -703,13 +688,6 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __RXTX_H__
diff --git a/drivers/staging/vt6656/srom.h b/drivers/staging/vt6656/srom.h
index af208ec9308..4c89e7ad6b4 100644
--- a/drivers/staging/vt6656/srom.h
+++ b/drivers/staging/vt6656/srom.h
@@ -27,16 +27,10 @@
*
*/
-
#ifndef __SROM_H__
#define __SROM_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-
-
/*--------------------- Export Definitions -------------------------*/
@@ -129,16 +123,5 @@ typedef struct tagSSromReg {
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
-
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
#endif // __EEPROM_H__
diff --git a/drivers/staging/vt6656/tbit.h b/drivers/staging/vt6656/tbit.h
index 7c3a82e9b60..1850282ce44 100644
--- a/drivers/staging/vt6656/tbit.h
+++ b/drivers/staging/vt6656/tbit.h
@@ -27,15 +27,10 @@
*
*/
-
#ifndef __TBIT_H__
#define __TBIT_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/tcrc.c b/drivers/staging/vt6656/tcrc.c
index b70080c267c..79347e48369 100644
--- a/drivers/staging/vt6656/tcrc.c
+++ b/drivers/staging/vt6656/tcrc.c
@@ -33,16 +33,8 @@
*
*/
-
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__TCRC_H__)
#include "tcrc.h"
-#endif
-
-
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/tcrc.h b/drivers/staging/vt6656/tcrc.h
index ebea22ed2da..5faa48b0a74 100644
--- a/drivers/staging/vt6656/tcrc.h
+++ b/drivers/staging/vt6656/tcrc.h
@@ -26,16 +26,10 @@
*
*/
-
#ifndef __TCRC_H__
#define __TCRC_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-
-
/*--------------------- Export Definitions -------------------------*/
@@ -48,23 +42,11 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed);
DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte);
DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC);
-
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __TCRC_H__
diff --git a/drivers/staging/vt6656/tether.c b/drivers/staging/vt6656/tether.c
index fd69423fe14..7268735d01c 100644
--- a/drivers/staging/vt6656/tether.c
+++ b/drivers/staging/vt6656/tether.c
@@ -32,24 +32,11 @@
*
*/
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__TCRC_H__)
#include "tcrc.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-
-
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h
index 8f40a74bf3b..5a3c326436c 100644
--- a/drivers/staging/vt6656/tether.h
+++ b/drivers/staging/vt6656/tether.h
@@ -26,18 +26,10 @@
*
*/
-
-
#ifndef __TETHER_H__
#define __TETHER_H__
-
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-
-
/*--------------------- Export Definitions -------------------------*/
//
@@ -233,23 +225,11 @@ S802_11Header, *PS802_11Header;
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr);
//BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr);
BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength);
-
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __TETHER_H__
diff --git a/drivers/staging/vt6656/tkip.c b/drivers/staging/vt6656/tkip.c
index 2ded8420c39..c02ce6a713d 100644
--- a/drivers/staging/vt6656/tkip.c
+++ b/drivers/staging/vt6656/tkip.c
@@ -32,20 +32,10 @@
*
*/
-
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__TKIP_H__)
#include "tkip.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/tkip.h b/drivers/staging/vt6656/tkip.h
index dc8382b6701..847ecdf97ee 100644
--- a/drivers/staging/vt6656/tkip.h
+++ b/drivers/staging/vt6656/tkip.h
@@ -27,19 +27,11 @@
*
*/
-
#ifndef __TKIP_H__
#define __TKIP_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
#define TKIP_KEY_LEN 16
@@ -53,9 +45,6 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
VOID TKIPvMixKey(
PBYTE pbyTKey,
@@ -65,11 +54,6 @@ VOID TKIPvMixKey(
PBYTE pbyRC4Key
);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
#endif // __TKIP_H__
diff --git a/drivers/staging/vt6656/tmacro.h b/drivers/staging/vt6656/tmacro.h
index c850f9ec8f1..e96c140de05 100644
--- a/drivers/staging/vt6656/tmacro.h
+++ b/drivers/staging/vt6656/tmacro.h
@@ -26,7 +26,6 @@
*
*/
-
#ifndef __TMACRO_H__
#define __TMACRO_H__
@@ -51,8 +50,6 @@
#define LODWORD(q) ((q).u.dwLowDword)
#define HIDWORD(q) ((q).u.dwHighDword)
-
-
#if !defined(MAKEWORD)
#define MAKEWORD(lb, hb) ((WORD)(((BYTE)(lb)) | (((WORD)((BYTE)(hb))) << 8)))
#endif
diff --git a/drivers/staging/vt6656/tpci.h b/drivers/staging/vt6656/tpci.h
index 3a04845cbb5..d1fe2560027 100644
--- a/drivers/staging/vt6656/tpci.h
+++ b/drivers/staging/vt6656/tpci.h
@@ -29,16 +29,10 @@
*
*/
-
#ifndef __TPCI_H__
#define __TPCI_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-
-
/*--------------------- Export Definitions -------------------------*/
#define MAX_PCI_BUS 4 // max. # of PCI bus that we support
diff --git a/drivers/staging/vt6656/umem.h b/drivers/staging/vt6656/umem.h
index 2c3eafa038e..916adde864a 100644
--- a/drivers/staging/vt6656/umem.h
+++ b/drivers/staging/vt6656/umem.h
@@ -31,11 +31,7 @@
#ifndef __UMEM_H__
#define __UMEM_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
// 4-byte memory tag
diff --git a/drivers/staging/vt6656/upc.h b/drivers/staging/vt6656/upc.h
index 113fc2c88c1..acd1b661490 100644
--- a/drivers/staging/vt6656/upc.h
+++ b/drivers/staging/vt6656/upc.h
@@ -26,16 +26,11 @@
*
*/
-
#ifndef __UPC_H__
#define __UPC_H__
-#if !defined(DEVICE_H)
#include "device.h"
-#endif
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index ee458c492d5..74852eccafd 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -38,28 +38,13 @@
*
*/
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__INT_H__)
#include "int.h"
-#endif
-#if !defined(__RXTX_H__)
#include "rxtx.h"
-#endif
-#if !defined(__DPC_H__)
#include "dpc.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__DESC_H__)
#include "desc.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-
/*--------------------- Static Definitions -------------------------*/
//endpoint def
diff --git a/drivers/staging/vt6656/usbpipe.h b/drivers/staging/vt6656/usbpipe.h
index 729edadb491..c422d1d0873 100644
--- a/drivers/staging/vt6656/usbpipe.h
+++ b/drivers/staging/vt6656/usbpipe.h
@@ -27,18 +27,11 @@
*
*/
-
#ifndef __USBPIPE_H__
#define __USBPIPE_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
@@ -47,9 +40,6 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
NTSTATUS
PIPEnsControlOut(
@@ -103,13 +93,6 @@ PIPEnsSendBulkOut(
IN PUSB_SEND_CONTEXT pContext
);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __USBPIPE_H__
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 899efb1d53f..ce1d25060c0 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -38,67 +38,25 @@
*
*/
-
-
-
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-#if !defined(__WCMD_H__)
#include "wcmd.h"
-#endif
-#if !defined(__WMGR_H__)
#include "wmgr.h"
-#endif
-#if !defined(__POWER_H__)
#include "power.h"
-#endif
-#if !defined(__WCTL_H__)
#include "wctl.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__RXTX_H__)
#include "rxtx.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-#if !defined (_CHANNEL_H_)
#include "channel.h"
-#endif
-//DavidWang
-#if !defined(__IOWPA_H__)
#include "iowpa.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h
index 58376c50466..90d672b462b 100644
--- a/drivers/staging/vt6656/wcmd.h
+++ b/drivers/staging/vt6656/wcmd.h
@@ -29,15 +29,9 @@
#ifndef __WCMD_H__
#define __WCMD_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-#if !defined(__80211MGR_H__)
#include "80211mgr.h"
-#endif
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/wctl.c b/drivers/staging/vt6656/wctl.c
index a318f00441f..40986da1e4a 100644
--- a/drivers/staging/vt6656/wctl.c
+++ b/drivers/staging/vt6656/wctl.c
@@ -34,19 +34,10 @@
*
*/
-
-#if !defined(__WCTL_H__)
#include "wctl.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/wctl.h b/drivers/staging/vt6656/wctl.h
index f75ca59f6c6..a1ac4791bfd 100644
--- a/drivers/staging/vt6656/wctl.h
+++ b/drivers/staging/vt6656/wctl.h
@@ -26,21 +26,12 @@
*
*/
-
#ifndef __WCTL_H__
#define __WCTL_H__
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
@@ -105,22 +96,12 @@
/*--------------------- Export Variables --------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader);
BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV);
UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __WCTL_H__
diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index b81ddf64dab..cabe8634f5a 100644
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -61,70 +61,28 @@
*
*/
-
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TBIT_H__)
#include "tbit.h"
-#endif
-#if !defined(__DESC_H__)
#include "desc.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-#if !defined(__80211MGR_H__)
#include "80211mgr.h"
-#endif
-#if !defined(__WMGR_H__)
#include "wmgr.h"
-#endif
-#if !defined(__WCMD_H__)
#include "wcmd.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__BSSDB_H__)
#include "bssdb.h"
-#endif
-#if !defined(__POWER_H__)
#include "power.h"
-#endif
-#if !defined(__DATARATE_H__)
#include "datarate.h"
-#endif
-#if !defined(__BASEBAND_H__)
#include "baseband.h"
-#endif
-#if !defined(__RXTX_H__)
#include "rxtx.h"
-#endif
-#if !defined(__WPA_H__)
#include "wpa.h"
-#endif
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__IOWPA_H__)
#include "iowpa.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
+
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h
index e780db4139d..c682a7fcbef 100644
--- a/drivers/staging/vt6656/wmgr.h
+++ b/drivers/staging/vt6656/wmgr.h
@@ -31,33 +31,16 @@
*
*/
-
#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(__WPA2_H__)
#include "wpa2.h"
-#endif
-#if !defined(__CARD_H__)
#include "card.h"
-#endif
-
-
/*--------------------- Export Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/wpa.c b/drivers/staging/vt6656/wpa.c
index 93614a06efe..2e508973c42 100644
--- a/drivers/staging/vt6656/wpa.c
+++ b/drivers/staging/vt6656/wpa.c
@@ -32,38 +32,16 @@
*
*/
-
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__TMACRO_H__)
#include "tmacro.h"
-#endif
-#if !defined(__TETHER_H__)
#include "tether.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-#if !defined(__BSSDB_H__)
#include "bssdb.h"
-#endif
-#if !defined(__WMGR_H__)
#include "wmgr.h"
-#endif
-#if !defined(__WPA_H__)
#include "wpa.h"
-#endif
-#if !defined(__80211MGR_H__)
#include "80211mgr.h"
-#endif
-
/*--------------------- Static Variables --------------------------*/
static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/wpa.h b/drivers/staging/vt6656/wpa.h
index 8000a37c6fc..9d9ce01d0c6 100644
--- a/drivers/staging/vt6656/wpa.h
+++ b/drivers/staging/vt6656/wpa.h
@@ -31,14 +31,8 @@
#ifndef __WPA_H__
#define __WPA_H__
-
-#if !defined(__TTYPE_H__)
#include "ttype.h"
-#endif
-#if !defined(__80211HDR_H__)
#include "80211hdr.h"
-#endif
-
/*--------------------- Export Definitions -------------------------*/
@@ -63,9 +57,6 @@
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
VOID
WPA_ClearRSN(
@@ -90,9 +81,4 @@ WPAb_Is_RSN(
IN PWLAN_IE_RSN_EXT pRSN
);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
#endif // __WPA_H__
diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index 82c972dbfbf..1e6244fc23a 100644
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -30,19 +30,11 @@
* Date: Oct. 4, 2004
*
*/
-#if !defined(__WPA2_H__)
+
#include "wpa2.h"
-#endif
-#if !defined(__UMEM_H__)
#include "umem.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__WMGR_H__)
#include "wmgr.h"
-#endif
-
/*--------------------- Static Definitions -------------------------*/
static int msglevel =MSG_LEVEL_INFO;
diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h
index cd1ea14b586..e553b386900 100644
--- a/drivers/staging/vt6656/wpa2.h
+++ b/drivers/staging/vt6656/wpa2.h
@@ -31,22 +31,10 @@
#ifndef __WPA2_H__
#define __WPA2_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(__BSSDB_H__)
#include "bssdb.h"
-#endif
-
-
-
/*--------------------- Export Definitions -------------------------*/
#define MAX_PMKID_CACHE 16
@@ -69,9 +57,6 @@ typedef struct tagSPMKIDCache {
/*--------------------- Export Types ------------------------------*/
/*--------------------- Export Functions --------------------------*/
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
VOID
WPA2_ClearRSN (
@@ -90,10 +75,4 @@ WPA2uSetIEs(
OUT PWLAN_IE_RSN pRSNIEs
);
-
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
#endif // __WPA2_H__
diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c
index 37c2900d6d1..4555bc0448b 100644
--- a/drivers/staging/vt6656/wpactl.c
+++ b/drivers/staging/vt6656/wpactl.c
@@ -31,38 +31,16 @@
*
*/
-
-#if !defined(__WPACTL_H__)
#include "wpactl.h"
-#endif
-#if !defined(__KEY_H__)
#include "key.h"
-#endif
-#if !defined(__MAC_H__)
#include "mac.h"
-#endif
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-#if !defined(__WMGR_H__)
#include "wmgr.h"
-#endif
-#if !defined(__IOCMD_H__)
#include "iocmd.h"
-#endif
-#if !defined(__IOWPA_H__)
#include "iowpa.h"
-#endif
-#if !defined(__CONTROL_H__)
#include "control.h"
-#endif
-#if !defined(__RNDIS_H__)
#include "rndis.h"
-#endif
-//2008-0717-05, <Add> by James
-#if !defined(__RF_H__)
#include "rf.h"
-#endif
/*--------------------- Static Definitions -------------------------*/
diff --git a/drivers/staging/vt6656/wpactl.h b/drivers/staging/vt6656/wpactl.h
index 2db748bc8f6..56179f01311 100644
--- a/drivers/staging/vt6656/wpactl.h
+++ b/drivers/staging/vt6656/wpactl.h
@@ -26,19 +26,13 @@
*
*/
-
#ifndef __WPACTL_H__
#define __WPACTL_H__
-#if !defined(__DEVICE_H__)
#include "device.h"
-#endif
-
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-#if !defined(__IOWPA_H__)
#include "iowpa.h"
#endif
-#endif
/*--------------------- Export Definitions -------------------------*/
@@ -68,22 +62,10 @@ typedef ULONGLONG NDIS_802_11_KEY_RSC;
/*--------------------- Export Functions --------------------------*/
-
-#ifdef __cplusplus
-extern "C" { /* Assume C declarations for C++ */
-#endif /* __cplusplus */
-
int wpa_set_wpadev(PSDevice pDevice, int val);
int wpa_ioctl(PSDevice pDevice, struct iw_point *p);
int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel);
-#ifdef __cplusplus
-} /* End of extern "C" { */
-#endif /* __cplusplus */
-
-
-
-
#endif // __WPACL_H__