aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJouni Malinen <jkmaline@cc.hut.fi>2005-08-28 13:51:33 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-28 19:23:07 -0400
commit51e828b6a123912f27afc512377ad3e2ab40d2eb (patch)
tree878cb9f93b541af1e6ed4653a58640bb5acf7713 /include
parent5f55d0850e4ae0b4bfabc9a372af5b9f52be02da (diff)
[PATCH] ieee80211: Remove EAPOL debug
IEEE 802.11 code has no business touching payloads of EAPOL frames. There are some EAPOL structures defined for debugging and these were confusingly called EAP types which they are not. Let's just remove these before someone else starts using them in the kernel. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/ieee80211.h31
1 files changed, 0 insertions, 31 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 2f46458e81b7..679cbf1efdf2 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -56,35 +56,6 @@ struct ieee80211_hdr_3addr {
56 __le16 seq_ctl; 56 __le16 seq_ctl;
57} __attribute__ ((packed)); 57} __attribute__ ((packed));
58 58
59enum eap_type {
60 EAP_PACKET = 0,
61 EAPOL_START,
62 EAPOL_LOGOFF,
63 EAPOL_KEY,
64 EAPOL_ENCAP_ASF_ALERT
65};
66
67static const char *eap_types[] = {
68 [EAP_PACKET] = "EAP-Packet",
69 [EAPOL_START] = "EAPOL-Start",
70 [EAPOL_LOGOFF] = "EAPOL-Logoff",
71 [EAPOL_KEY] = "EAPOL-Key",
72 [EAPOL_ENCAP_ASF_ALERT] = "EAPOL-Encap-ASF-Alert"
73};
74
75static inline const char *eap_get_type(int type)
76{
77 return (type >= ARRAY_SIZE(eap_types)) ? "Unknown" : eap_types[type];
78}
79
80struct eapol {
81 u8 snap[6];
82 __be16 ethertype;
83 u8 version;
84 u8 type;
85 __be16 length;
86} __attribute__ ((packed));
87
88#define IEEE80211_1ADDR_LEN 10 59#define IEEE80211_1ADDR_LEN 10
89#define IEEE80211_2ADDR_LEN 16 60#define IEEE80211_2ADDR_LEN 16
90#define IEEE80211_3ADDR_LEN 24 61#define IEEE80211_3ADDR_LEN 24
@@ -202,7 +173,6 @@ const char *escape_essid(const char *essid, u8 essid_len);
202#define IEEE80211_DL_STATE (1<<3) 173#define IEEE80211_DL_STATE (1<<3)
203#define IEEE80211_DL_MGMT (1<<4) 174#define IEEE80211_DL_MGMT (1<<4)
204#define IEEE80211_DL_FRAG (1<<5) 175#define IEEE80211_DL_FRAG (1<<5)
205#define IEEE80211_DL_EAP (1<<6)
206#define IEEE80211_DL_DROP (1<<7) 176#define IEEE80211_DL_DROP (1<<7)
207 177
208#define IEEE80211_DL_TX (1<<8) 178#define IEEE80211_DL_TX (1<<8)
@@ -217,7 +187,6 @@ const char *escape_essid(const char *essid, u8 essid_len);
217#define IEEE80211_DEBUG_STATE(f, a...) IEEE80211_DEBUG(IEEE80211_DL_STATE, f, ## a) 187#define IEEE80211_DEBUG_STATE(f, a...) IEEE80211_DEBUG(IEEE80211_DL_STATE, f, ## a)
218#define IEEE80211_DEBUG_MGMT(f, a...) IEEE80211_DEBUG(IEEE80211_DL_MGMT, f, ## a) 188#define IEEE80211_DEBUG_MGMT(f, a...) IEEE80211_DEBUG(IEEE80211_DL_MGMT, f, ## a)
219#define IEEE80211_DEBUG_FRAG(f, a...) IEEE80211_DEBUG(IEEE80211_DL_FRAG, f, ## a) 189#define IEEE80211_DEBUG_FRAG(f, a...) IEEE80211_DEBUG(IEEE80211_DL_FRAG, f, ## a)
220#define IEEE80211_DEBUG_EAP(f, a...) IEEE80211_DEBUG(IEEE80211_DL_EAP, f, ## a)
221#define IEEE80211_DEBUG_DROP(f, a...) IEEE80211_DEBUG(IEEE80211_DL_DROP, f, ## a) 190#define IEEE80211_DEBUG_DROP(f, a...) IEEE80211_DEBUG(IEEE80211_DL_DROP, f, ## a)
222#define IEEE80211_DEBUG_TX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_TX, f, ## a) 191#define IEEE80211_DEBUG_TX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_TX, f, ## a)
223#define IEEE80211_DEBUG_RX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a) 192#define IEEE80211_DEBUG_RX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a)