diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
| commit | ba4ccd8831a8174e533cb02d03134a512e4ea79b (patch) | |
| tree | b3be2e92ab11ef568ff5ccba47989e6d5950222c /drivers/staging/vt6655/vntwifi.h | |
| parent | c23553f91afc3d030b45bfbf637a08698558ff9b (diff) | |
| parent | a6ab2b64c43054920f41332ab12e853997d467cf (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/vt6655/vntwifi.h')
| -rw-r--r-- | drivers/staging/vt6655/vntwifi.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/staging/vt6655/vntwifi.h b/drivers/staging/vt6655/vntwifi.h index 3e620a726212..2854dfcb19aa 100644 --- a/drivers/staging/vt6655/vntwifi.h +++ b/drivers/staging/vt6655/vntwifi.h @@ -30,15 +30,10 @@ #ifndef __VNTWIFI_H__ #define __VNTWIFI_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__80211MGR_H__) #include "80211mgr.h" -#endif -#if !defined(__CARD_H__) #include "card.h" -#endif +#include "wpa2.h" /*--------------------- Export Definitions -------------------------*/ #define RATE_1M 0 @@ -67,8 +62,6 @@ #define MAX_BSS_NUM 42 -#define MAX_PMKID_CACHE 16 - // Pre-configured Authenticaiton Mode (from XP) typedef enum tagWMAC_AUTHENTICATION_MODE { @@ -147,11 +140,6 @@ typedef enum tagWMAC_POWER_MODE { /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - - VOID VNTWIFIvSetIBSSParameter ( IN PVOID pMgmtHandle, @@ -322,9 +310,4 @@ VNTWIFIbRadarPresent( ); */ -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif //__VNTWIFI_H__ |