diff options
author | David S. Miller <davem@davemloft.net> | 2009-04-21 01:32:26 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-21 01:32:26 -0700 |
commit | e5e9743bb7429f53c83ad69b432f7b661e74c3f0 (patch) | |
tree | db3691aef0d46c4aed4a2be6dc8ab7c44c3488cb /net/mac80211/main.c | |
parent | a0f82f64e26929776c58a5c93c2ecb38e3d82815 (diff) | |
parent | 775d8d931581764a1ec982ebe5a927b12762fb6d (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
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 a6f1d8a869b..fbcbed6cad0 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) { |