summaryrefslogtreecommitdiff
path: root/include/net/ieee80211.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-05-06 00:56:24 +0400
committerJohn W. Linville <linville@tuxdriver.com>2006-05-06 00:56:24 +0400
commitfd5226a72694d1c0abe1cc39711a86f1754e637d (patch)
tree1d90b27c392fb2ef9859f2652dee7640916ed806 /include/net/ieee80211.h
parentaad61439e6a00bdb72cb649e11f6e166590c5f66 (diff)
parent178e0cc5ff249965c6cfbd78b1af6a5e614d837c (diff)
downloadlinux-fd5226a72694d1c0abe1cc39711a86f1754e637d.tar.xz
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/net/ieee80211.h')
-rw-r--r--include/net/ieee80211.h6
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 {
#define IEEE80211_24GHZ_MIN_CHANNEL 1
#define IEEE80211_24GHZ_MAX_CHANNEL 14
-#define IEEE80211_24GHZ_CHANNELS 14
+#define IEEE80211_24GHZ_CHANNELS (IEEE80211_24GHZ_MAX_CHANNEL - \
+ IEEE80211_24GHZ_MIN_CHANNEL + 1)
#define IEEE80211_52GHZ_MIN_CHANNEL 34
#define IEEE80211_52GHZ_MAX_CHANNEL 165
-#define IEEE80211_52GHZ_CHANNELS 131
+#define IEEE80211_52GHZ_CHANNELS (IEEE80211_52GHZ_MAX_CHANNEL - \
+ IEEE80211_52GHZ_MIN_CHANNEL + 1)
enum {
IEEE80211_CH_PASSIVE_ONLY = (1 << 0),