aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-01-06 23:23:56 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:53 -0500
commit2bf30fabadbdcb535b057afc92aba015884847dc (patch)
tree7a0234aeb666602e7b25a62bb7e483be0fb4a742 /net/mac80211/main.c
parent8465676241cad5e28a1b745c32a0e18e1f67e18e (diff)
mac80211: remove user_power_level from driver API
I missed this during review of "mac80211: Fix tx power setting", the user_power_level shouldn't be available to the driver but rather be an internal value used to calculate the value for the driver. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Cc: Vasanthakumar Thiagarajan <vasanth@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index dca4b7da6ca..b55b9970dc9 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -214,10 +214,10 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
changed |= IEEE80211_CONF_CHANGE_CHANNEL;
}
- if (!local->hw.conf.user_power_level)
+ if (!local->user_power_level)
power = chan->max_power;
else
- power = min(chan->max_power, local->hw.conf.user_power_level);
+ power = min(chan->max_power, local->user_power_level);
if (local->hw.conf.power_level != power) {
changed |= IEEE80211_CONF_CHANGE_POWER;
local->hw.conf.power_level = power;