diff options
Diffstat (limited to 'include/net/ieee80211.h')
| -rw-r--r-- | include/net/ieee80211.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index db09580ad14..11524c9b659 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -20,9 +20,9 @@ */ #ifndef IEEE80211_H #define IEEE80211_H - #include <linux/if_ether.h> /* ETH_ALEN */ #include <linux/kernel.h> /* ARRAY_SIZE */ +#include <linux/wireless.h> #if WIRELESS_EXT < 17 #define IW_QUAL_QUAL_INVALID 0x10 @@ -104,7 +104,7 @@ struct eapol { #define MAX_FRAG_THRESHOLD 2346U /* Frame control field constants */ -#define IEEE80211_FCTL_VERS 0x0002 +#define IEEE80211_FCTL_VERS 0x0003 #define IEEE80211_FCTL_FTYPE 0x000c #define IEEE80211_FCTL_STYPE 0x00f0 #define IEEE80211_FCTL_TODS 0x0100 @@ -426,9 +426,7 @@ struct ieee80211_stats { struct ieee80211_device; -#if 0 /* for later */ #include "ieee80211_crypt.h" -#endif #define SEC_KEY_1 (1<<0) #define SEC_KEY_2 (1<<1) @@ -852,5 +850,4 @@ static inline const char *escape_essid(const char *essid, u8 essid_len) { *d = '\0'; return escaped; } - #endif /* IEEE80211_H */ |