commit 72118015271e6d3852cb9f647efe0987d131adaa
author John W. Linville <linville@tuxdriver.com> Tue Sep 30 21:43:03 2008 -0400
committer John W. Linville <linville@tuxdriver.com> Fri Oct 31 19:00:50 2008 -0400
tree 6cf548edeb3eb1d6c561fc78951096775de86b22
parent 9387b7caf3049168fc97a8a9111af8fe2143af18

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>

include/linux/ieee80211.h

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 @@
 /* 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