Merge branch 'linus' into x86/kconfig

[linux-2.6] / net / wireless / reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 2b63c96dcf199a2e22a8c23f80ba0f240bd5f234..185488da246647c06bd85261f856a71fed182c34 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),
 };
@@ -130,7 +136,10 @@ static void handle_channel(struct ieee80211_channel *chan,
        chan->flags = flags;
        chan->max_antenna_gain = min(chan->orig_mag,
                                         rg->max_antenna_gain);
-       chan->max_power = min(chan->orig_mpwr, rg->max_power);
+       if (chan->orig_mpwr)
+               chan->max_power = min(chan->orig_mpwr, rg->max_power);
+       else
+               chan->max_power = rg->max_power;
 }
 
 static void handle_band(struct ieee80211_supported_band *sband,