diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:56:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:56:24 -0400 |
| commit | fd5226a72694d1c0abe1cc39711a86f1754e637d (patch) | |
| tree | 1d90b27c392fb2ef9859f2652dee7640916ed806 /include/net/ieee80211.h | |
| parent | aad61439e6a00bdb72cb649e11f6e166590c5f66 (diff) | |
| parent | 178e0cc5ff249965c6cfbd78b1af6a5e614d837c (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/net/ieee80211.h')
| -rw-r--r-- | include/net/ieee80211.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 4087dfc47094..293e920ca59d 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
| @@ -958,11 +958,13 @@ enum ieee80211_state { | |||
| 958 | 958 | ||
| 959 | #define IEEE80211_24GHZ_MIN_CHANNEL 1 | 959 | #define IEEE80211_24GHZ_MIN_CHANNEL 1 |
| 960 | #define IEEE80211_24GHZ_MAX_CHANNEL 14 | 960 | #define IEEE80211_24GHZ_MAX_CHANNEL 14 |
| 961 | #define IEEE80211_24GHZ_CHANNELS 14 | 961 | #define IEEE80211_24GHZ_CHANNELS (IEEE80211_24GHZ_MAX_CHANNEL - \ |
| 962 | IEEE80211_24GHZ_MIN_CHANNEL + 1) | ||
| 962 | 963 | ||
| 963 | #define IEEE80211_52GHZ_MIN_CHANNEL 34 | 964 | #define IEEE80211_52GHZ_MIN_CHANNEL 34 |
| 964 | #define IEEE80211_52GHZ_MAX_CHANNEL 165 | 965 | #define IEEE80211_52GHZ_MAX_CHANNEL 165 |
| 965 | #define IEEE80211_52GHZ_CHANNELS 131 | 966 | #define IEEE80211_52GHZ_CHANNELS (IEEE80211_52GHZ_MAX_CHANNEL - \ |
| 967 | IEEE80211_52GHZ_MIN_CHANNEL + 1) | ||
| 966 | 968 | ||
| 967 | enum { | 969 | enum { |
| 968 | IEEE80211_CH_PASSIVE_ONLY = (1 << 0), | 970 | IEEE80211_CH_PASSIVE_ONLY = (1 << 0), |