diff options
Diffstat (limited to 'drivers/net/wireless/bcmdhd/include/proto/wpa.h')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/include/proto/wpa.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/wireless/bcmdhd/include/proto/wpa.h b/drivers/net/wireless/bcmdhd/include/proto/wpa.h index 47bc354..7ebeeda 100644 --- a/drivers/net/wireless/bcmdhd/include/proto/wpa.h +++ b/drivers/net/wireless/bcmdhd/include/proto/wpa.h @@ -21,7 +21,7 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: wpa.h 261155 2011-05-23 23:51:32Z $ + * $Id: wpa.h 369547 2012-11-19 08:57:31Z $ */ #ifndef _proto_wpa_h_ @@ -34,7 +34,11 @@ #include <packed_section_start.h> +#ifdef CUSTOMER_HW4 #include <dhd_sec_feature.h> +#endif + + #define DOT11_RC_INVALID_WPA_IE 13 @@ -116,9 +120,9 @@ typedef BWL_PRE_PACKED_STRUCT struct #define WPA_CIPHER_BIP 6 #define WPA_CIPHER_TPK 7 #ifdef BCMCCX -#define WPA_CIPHER_CKIP 8 -#define WPA_CIPHER_CKIP_MMH 9 -#define WPA_CIPHER_WEP_MMH 10 +#define WPA_CIPHER_CKIP 8 +#define WPA_CIPHER_CKIP_MMH 9 +#define WPA_CIPHER_WEP_MMH 10 #define IS_CCX_CIPHER(cipher) ((cipher) == WPA_CIPHER_CKIP || \ (cipher) == WPA_CIPHER_CKIP_MMH || \ @@ -170,10 +174,8 @@ typedef BWL_PRE_PACKED_STRUCT struct #define RSN_CAP_2_REPLAY_CNTRS 1 #define RSN_CAP_4_REPLAY_CNTRS 2 #define RSN_CAP_16_REPLAY_CNTRS 3 -#ifdef MFP #define RSN_CAP_MFPR 0x0040 #define RSN_CAP_MFPC 0x0080 -#endif #define WPA_CAP_4_REPLAY_CNTRS RSN_CAP_4_REPLAY_CNTRS |