diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-28 16:06:30 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-28 16:06:30 -0500 |
| commit | b0b020d4783fbc4cc477e2ca678ac47c50d5bc3e (patch) | |
| tree | 0b241c17a89330382527e667f96b64cc22397cfc /include | |
| parent | 6651a5c3839517685c601e44979f19de8b6249c3 (diff) | |
| parent | 4a99ac3a9ee7e1b90ebc3ddbb44db75eef5c41e6 (diff) | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index df05f468fa..9a92aef8b0 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
| @@ -803,9 +803,9 @@ enum ieee80211_state { | |||
| 803 | #define IEEE80211_24GHZ_MAX_CHANNEL 14 | 803 | #define IEEE80211_24GHZ_MAX_CHANNEL 14 |
| 804 | #define IEEE80211_24GHZ_CHANNELS 14 | 804 | #define IEEE80211_24GHZ_CHANNELS 14 |
| 805 | 805 | ||
| 806 | #define IEEE80211_52GHZ_MIN_CHANNEL 36 | 806 | #define IEEE80211_52GHZ_MIN_CHANNEL 34 |
| 807 | #define IEEE80211_52GHZ_MAX_CHANNEL 165 | 807 | #define IEEE80211_52GHZ_MAX_CHANNEL 165 |
| 808 | #define IEEE80211_52GHZ_CHANNELS 32 | 808 | #define IEEE80211_52GHZ_CHANNELS 131 |
| 809 | 809 | ||
| 810 | enum { | 810 | enum { |
| 811 | IEEE80211_CH_PASSIVE_ONLY = (1 << 0), | 811 | IEEE80211_CH_PASSIVE_ONLY = (1 << 0), |