diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-05-08 16:01:20 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@osdl.org> | 2006-05-08 16:01:20 -0700 |
| commit | 23aee82e75c1ced9492cbff6090b8e213d95945e (patch) | |
| tree | 2d8f0f7fc59a65bffc852c7dc167ee6b196c07a7 /include/net/ieee80211.h | |
| parent | 8ec93459655a3618dedec6360bb28d63f0010ef6 (diff) | |
| parent | 178e0cc5ff249965c6cfbd78b1af6a5e614d837c (diff) | |
| download | op-kernel-dev-23aee82e75c1ced9492cbff6090b8e213d95945e.zip op-kernel-dev-23aee82e75c1ced9492cbff6090b8e213d95945e.tar.gz | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 4725ff8..d5926bf 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -955,11 +955,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), |
