diff options
| author | John W. Linville <linville@tuxdriver.com> | 2008-04-03 15:32:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-04-08 16:44:41 -0400 |
| commit | 253898c4170c7f426d1bc32860fee04f27de3ade (patch) | |
| tree | e016a6e7de609bf6544026b74f7f14dc43b1c595 /net/wireless | |
| parent | d59f720d88089f2feabe4335839521b26572dc75 (diff) | |
| download | linux-253898c4170c7f426d1bc32860fee04f27de3ade.tar.gz linux-253898c4170c7f426d1bc32860fee04f27de3ade.tar.bz2 linux-253898c4170c7f426d1bc32860fee04f27de3ade.zip | |
cfg80211: default to regulatory max power for channel
If the driver does not specify a maximum power output, default to the
regulatory max.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/reg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 8cc6037eb2ae..185488da2466 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, |