X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fwireless%2Freg.c;h=185488da246647c06bd85261f856a71fed182c34;hb=44473d991332053eb3fea1e08f8a6ee2c6fb409c;hp=8cc6037eb2aede16e748c7afa8f1cdbf745925b2;hpb=b46b4ee034645dc87a34b29a7989a2540a8ee8ea;p=linux-2.6

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 8cc6037eb2..185488da24 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -136,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,