--- drivers/net/wireless/bcmdhd/include/proto/wpa.h

+++ drivers/net/wireless/bcmdhd/include/proto/wpa.h

@@ -36,9 +36,7 @@

#ifdef CUSTOMER_HW4

#include <dhd_sec_feature.h>

-#endif

-

-

+#endif

#define DOT11_RC_INVALID_WPA_IE 13

@@ -120,9 +118,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 || \