diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-28 19:23:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-28 19:23:37 -0400 |
| commit | fd67b0641118031a65d370f65bd80eef1982b45a (patch) | |
| tree | 2e3b8fa3fc93bc1b2b94588b83069e9ea6f602ad /include | |
| parent | 831a179fc9387af6dbaa12816ae1e074d1f1a730 (diff) | |
| parent | 91cb70c1769d9b72dd1efe40c31f01005820b09e (diff) | |
| download | blackbird-op-linux-fd67b0641118031a65d370f65bd80eef1982b45a.tar.gz blackbird-op-linux-fd67b0641118031a65d370f65bd80eef1982b45a.zip | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211.h | 46 |
1 files changed, 3 insertions, 43 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 8bc126938cd4..dc36b1be6745 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -24,15 +24,6 @@ #include <linux/kernel.h> /* ARRAY_SIZE */ #include <linux/wireless.h> -#if WIRELESS_EXT < 17 -#define IW_QUAL_QUAL_INVALID 0x10 -#define IW_QUAL_LEVEL_INVALID 0x20 -#define IW_QUAL_NOISE_INVALID 0x40 -#define IW_QUAL_QUAL_UPDATED 0x1 -#define IW_QUAL_LEVEL_UPDATED 0x2 -#define IW_QUAL_NOISE_UPDATED 0x4 -#endif - #define IEEE80211_DATA_LEN 2304 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section 6.2.1.1.2. @@ -65,35 +56,6 @@ struct ieee80211_hdr_3addr { __le16 seq_ctl; } __attribute__ ((packed)); -enum eap_type { - EAP_PACKET = 0, - EAPOL_START, - EAPOL_LOGOFF, - EAPOL_KEY, - EAPOL_ENCAP_ASF_ALERT -}; - -static const char *eap_types[] = { - [EAP_PACKET] = "EAP-Packet", - [EAPOL_START] = "EAPOL-Start", - [EAPOL_LOGOFF] = "EAPOL-Logoff", - [EAPOL_KEY] = "EAPOL-Key", - [EAPOL_ENCAP_ASF_ALERT] = "EAPOL-Encap-ASF-Alert" -}; - -static inline const char *eap_get_type(int type) -{ - return (type >= ARRAY_SIZE(eap_types)) ? "Unknown" : eap_types[type]; -} - -struct eapol { - u8 snap[6]; - __be16 ethertype; - u8 version; - u8 type; - __be16 length; -} __attribute__ ((packed)); - #define IEEE80211_1ADDR_LEN 10 #define IEEE80211_2ADDR_LEN 16 #define IEEE80211_3ADDR_LEN 24 @@ -196,11 +158,11 @@ const char *escape_essid(const char *essid, u8 essid_len); * * To add your debug level to the list of levels seen when you perform * - * % cat /proc/net/ipw/debug_level + * % cat /proc/net/ieee80211/debug_level * - * you simply need to add your entry to the ipw_debug_levels array. + * you simply need to add your entry to the ieee80211_debug_level array. * - * If you do not see debug_level in /proc/net/ipw then you do not have + * If you do not see debug_level in /proc/net/ieee80211 then you do not have * CONFIG_IEEE80211_DEBUG defined in your kernel configuration * */ @@ -211,7 +173,6 @@ const char *escape_essid(const char *essid, u8 essid_len); #define IEEE80211_DL_STATE (1<<3) #define IEEE80211_DL_MGMT (1<<4) #define IEEE80211_DL_FRAG (1<<5) -#define IEEE80211_DL_EAP (1<<6) #define IEEE80211_DL_DROP (1<<7) #define IEEE80211_DL_TX (1<<8) @@ -226,7 +187,6 @@ const char *escape_essid(const char *essid, u8 essid_len); #define IEEE80211_DEBUG_STATE(f, a...) IEEE80211_DEBUG(IEEE80211_DL_STATE, f, ## a) #define IEEE80211_DEBUG_MGMT(f, a...) IEEE80211_DEBUG(IEEE80211_DL_MGMT, f, ## a) #define IEEE80211_DEBUG_FRAG(f, a...) IEEE80211_DEBUG(IEEE80211_DL_FRAG, f, ## a) -#define IEEE80211_DEBUG_EAP(f, a...) IEEE80211_DEBUG(IEEE80211_DL_EAP, f, ## a) #define IEEE80211_DEBUG_DROP(f, a...) IEEE80211_DEBUG(IEEE80211_DL_DROP, f, ## a) #define IEEE80211_DEBUG_TX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_TX, f, ## a) #define IEEE80211_DEBUG_RX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a) |
