Merge branch 'master' of ../net-2.6/

[~andy/linux] / net / wireless / reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 2b63c96dcf199a2e22a8c23f80ba0f240bd5f234..8cc6037eb2aede16e748c7afa8f1cdbf745925b2 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -58,8 +58,14 @@ struct ieee80211_regdomain {
 static const struct ieee80211_channel_range ieee80211_US_channels[] = {
        /* IEEE 802.11b/g, channels 1..11 */
        RANGE_PWR(2412, 2462, 27, 6, 0),
-       /* IEEE 802.11a, channels 52..64 */
-       RANGE_PWR(5260, 5320, 23, 6, 0),
+       /* IEEE 802.11a, channel 36*/
+       RANGE_PWR(5180, 5180, 23, 6, 0),
+       /* IEEE 802.11a, channel 40*/
+       RANGE_PWR(5200, 5200, 23, 6, 0),
+       /* IEEE 802.11a, channel 44*/
+       RANGE_PWR(5220, 5220, 23, 6, 0),
+       /* IEEE 802.11a, channels 48..64 */
+       RANGE_PWR(5240, 5320, 23, 6, 0),
        /* IEEE 802.11a, channels 149..165, outdoor */
        RANGE_PWR(5745, 5825, 30, 6, 0),
 };