diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 13:29:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 13:29:35 -0500 |
| commit | 0827f2b698735aee7cfb2990d393a82f6e1690eb (patch) | |
| tree | 5eb1fa871154ab36c38794c4dc488698f13c71e0 /include | |
| parent | 70b4d63e98fd93fb9742708a54f872cba24e0fea (diff) | |
| parent | c6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-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 df05f468fa5c..9a92aef8b0b2 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), |