aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ieee80211.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2008-09-30 21:43:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:00:50 -0400
commit72118015271e6d3852cb9f647efe0987d131adaa (patch)
tree6cf548edeb3eb1d6c561fc78951096775de86b22 /include/linux/ieee80211.h
parent9387b7caf3049168fc97a8a9111af8fe2143af18 (diff)
downloadkernel_samsung_smdk4412-72118015271e6d3852cb9f647efe0987d131adaa.zip
kernel_samsung_smdk4412-72118015271e6d3852cb9f647efe0987d131adaa.tar.gz
kernel_samsung_smdk4412-72118015271e6d3852cb9f647efe0987d131adaa.tar.bz2
wireless: avoid some net/ieee80211.h vs. linux/ieee80211.h conflicts
There is quite a lot of overlap in definitions between these headers... Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/ieee80211.h')
-rw-r--r--include/linux/ieee80211.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index b0726e2..aad9919 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -826,8 +826,7 @@ struct ieee80211_ht_info {
/* Authentication algorithms */
#define WLAN_AUTH_OPEN 0
#define WLAN_AUTH_SHARED_KEY 1
-#define WLAN_AUTH_FAST_BSS_TRANSITION 2
-#define WLAN_AUTH_LEAP 128
+#define WLAN_AUTH_LEAP 2
#define WLAN_AUTH_CHALLENGE_LEN 128