diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-17 15:54:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-17 15:54:40 -0700 |
| commit | 75a241f959a65ec9bde237d1af1a34ef794f0c9c (patch) | |
| tree | 6a2b9fe1b525b69ac094d6ae088e00cb5d626969 /net/mac80211/main.c | |
| parent | e18e37e50966f137f8a3b807fe0da7703779be34 (diff) | |
| parent | 957b0516f7881284b48f2f2e4a909a1c5de0ddf8 (diff) | |
| download | linux-75a241f959a65ec9bde237d1af1a34ef794f0c9c.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index a6f1d8a869bc..fbcbed6cad01 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -258,7 +258,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) (chan->max_power - local->power_constr_level) : chan->max_power; - if (local->user_power_level) + if (local->user_power_level >= 0) power = min(power, local->user_power_level); if (local->hw.conf.power_level != power) { |