diff options
| author | John W. Linville <linville@tuxdriver.com> | 2008-09-30 21:43:03 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:50 -0400 |
| commit | 72118015271e6d3852cb9f647efe0987d131adaa (patch) | |
| tree | 6cf548edeb3eb1d6c561fc78951096775de86b22 /include/linux/ieee80211.h | |
| parent | 9387b7caf3049168fc97a8a9111af8fe2143af18 (diff) | |
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.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index b0726e2079b5..aad99195a4cc 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -826,8 +826,7 @@ struct ieee80211_ht_info { | |||
| 826 | /* Authentication algorithms */ | 826 | /* Authentication algorithms */ |
| 827 | #define WLAN_AUTH_OPEN 0 | 827 | #define WLAN_AUTH_OPEN 0 |
| 828 | #define WLAN_AUTH_SHARED_KEY 1 | 828 | #define WLAN_AUTH_SHARED_KEY 1 |
| 829 | #define WLAN_AUTH_FAST_BSS_TRANSITION 2 | 829 | #define WLAN_AUTH_LEAP 2 |
| 830 | #define WLAN_AUTH_LEAP 128 | ||
| 831 | 830 | ||
| 832 | #define WLAN_AUTH_CHALLENGE_LEN 128 | 831 | #define WLAN_AUTH_CHALLENGE_LEN 128 |
| 833 | 832 | ||