diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/vt6655/wpa2.h | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/vt6655/wpa2.h')
-rw-r--r-- | drivers/staging/vt6655/wpa2.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/staging/vt6655/wpa2.h b/drivers/staging/vt6655/wpa2.h index bda045b..e553b38 100644 --- a/drivers/staging/vt6655/wpa2.h +++ b/drivers/staging/vt6655/wpa2.h @@ -31,26 +31,13 @@ #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 -#if !defined(__VNTWIFI_H__) -#include "vntwifi.h" -#endif - - /*--------------------- Export Definitions -------------------------*/ +#define MAX_PMKID_CACHE 16 typedef struct tagsPMKIDInfo { BYTE abyBSSID[6]; @@ -70,9 +57,6 @@ typedef struct tagSPMKIDCache { /*--------------------- Export Types ------------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ VOID WPA2_ClearRSN ( @@ -91,10 +75,4 @@ WPA2uSetIEs( OUT PWLAN_IE_RSN pRSNIEs ); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __WPA2_H__ |