Skip to content

Commit

Permalink
staging: brcm80211: removed unused macro's and typedefs from wpa.h
Browse files Browse the repository at this point in the history
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Dec 8, 2010
1 parent 0dedc37 commit 41224eb
Showing 1 changed file with 0 additions and 94 deletions.
94 changes: 0 additions & 94 deletions drivers/staging/brcm80211/include/proto/wpa.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,95 +19,7 @@

#include <proto/ethernet.h>

#include <packed_section_start.h>

#define DOT11_RC_INVALID_WPA_IE 13
#define DOT11_RC_MIC_FAILURE 14
#define DOT11_RC_4WH_TIMEOUT 15
#define DOT11_RC_GTK_UPDATE_TIMEOUT 16
#define DOT11_RC_WPA_IE_MISMATCH 17
#define DOT11_RC_INVALID_MC_CIPHER 18
#define DOT11_RC_INVALID_UC_CIPHER 19
#define DOT11_RC_INVALID_AKMP 20
#define DOT11_RC_BAD_WPA_VERSION 21
#define DOT11_RC_INVALID_WPA_CAP 22
#define DOT11_RC_8021X_AUTH_FAIL 23

#define WPA2_PMKID_LEN 16

typedef BWL_PRE_PACKED_STRUCT struct {
u8 tag;
u8 length;
u8 oui[3];
u8 oui_type;
BWL_PRE_PACKED_STRUCT struct {
u8 low;
u8 high;
} BWL_POST_PACKED_STRUCT version;
} BWL_POST_PACKED_STRUCT wpa_ie_fixed_t;
#define WPA_IE_OUITYPE_LEN 4
#define WPA_IE_FIXED_LEN 8
#define WPA_IE_TAG_FIXED_LEN 6

typedef BWL_PRE_PACKED_STRUCT struct {
u8 tag;
u8 length;
BWL_PRE_PACKED_STRUCT struct {
u8 low;
u8 high;
} BWL_POST_PACKED_STRUCT version;
} BWL_POST_PACKED_STRUCT wpa_rsn_ie_fixed_t;
#define WPA_RSN_IE_FIXED_LEN 4
#define WPA_RSN_IE_TAG_FIXED_LEN 2
typedef u8 wpa_pmkid_t[WPA2_PMKID_LEN];

typedef BWL_PRE_PACKED_STRUCT struct {
u8 oui[3];
u8 type;
} BWL_POST_PACKED_STRUCT wpa_suite_t, wpa_suite_mcast_t;
#define WPA_SUITE_LEN 4

typedef BWL_PRE_PACKED_STRUCT struct {
BWL_PRE_PACKED_STRUCT struct {
u8 low;
u8 high;
} BWL_POST_PACKED_STRUCT count;
wpa_suite_t list[1];
} BWL_POST_PACKED_STRUCT wpa_suite_ucast_t, wpa_suite_auth_key_mgmt_t;
#define WPA_IE_SUITE_COUNT_LEN 2
typedef BWL_PRE_PACKED_STRUCT struct {
BWL_PRE_PACKED_STRUCT struct {
u8 low;
u8 high;
} BWL_POST_PACKED_STRUCT count;
wpa_pmkid_t list[1];
} BWL_POST_PACKED_STRUCT wpa_pmkid_list_t;

#define WPA_CIPHER_NONE 0
#define WPA_CIPHER_WEP_40 1
#define WPA_CIPHER_TKIP 2
#define WPA_CIPHER_AES_OCB 3
#define WPA_CIPHER_AES_CCM 4
#define WPA_CIPHER_WEP_104 5

#define IS_WPA_CIPHER(cipher) ((cipher) == WPA_CIPHER_NONE || \
(cipher) == WPA_CIPHER_WEP_40 || \
(cipher) == WPA_CIPHER_WEP_104 || \
(cipher) == WPA_CIPHER_TKIP || \
(cipher) == WPA_CIPHER_AES_OCB || \
(cipher) == WPA_CIPHER_AES_CCM)

#define WPA_TKIP_CM_DETECT 60
#define WPA_TKIP_CM_BLOCK 60

#define RSN_CAP_LEN 2

#define RSN_CAP_PREAUTH 0x0001
#define RSN_CAP_NOPAIRWISE 0x0002
#define RSN_CAP_PTK_REPLAY_CNTR_MASK 0x000C
#define RSN_CAP_PTK_REPLAY_CNTR_SHIFT 2
#define RSN_CAP_GTK_REPLAY_CNTR_MASK 0x0030
#define RSN_CAP_GTK_REPLAY_CNTR_SHIFT 4
#define RSN_CAP_1_REPLAY_CNTR 0
#define RSN_CAP_2_REPLAY_CNTRS 1
#define RSN_CAP_4_REPLAY_CNTRS 2
Expand All @@ -118,10 +30,4 @@ typedef BWL_PRE_PACKED_STRUCT struct {
#define WPA_CAP_REPLAY_CNTR_SHIFT RSN_CAP_PTK_REPLAY_CNTR_SHIFT
#define WPA_CAP_REPLAY_CNTR_MASK RSN_CAP_PTK_REPLAY_CNTR_MASK

#define WPA_CAP_LEN RSN_CAP_LEN

#define WPA_CAP_WPA2_PREAUTH RSN_CAP_PREAUTH

#include <packed_section_end.h>

#endif /* _proto_wpa_h_ */

0 comments on commit 41224eb

Please sign in to comment.