From e1035c744c98de00015d4ed30a53dce420a7e306 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Thu, 3 Apr 2008 15:32:54 -0400 Subject: [PATCH] --- yaml --- r: 90573 b: refs/heads/master c: 253898c4170c7f426d1bc32860fee04f27de3ade h: refs/heads/master i: 90571: aedcec740e3a7a3c5f3c09c9153031260bbd4eaf v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 18271c13beb6..84cfdf00ecee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d59f720d88089f2feabe4335839521b26572dc75 +refs/heads/master: 253898c4170c7f426d1bc32860fee04f27de3ade diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index 8cc6037eb2ae..185488da2466 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/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,