summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorVasanthakumar Thiagarajan <vasanth@atheros.com>2008-12-24 13:53:11 +0530
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:36 -0500
commite3c92df08cbf6a0cb60a9c7ce377378383967e07 (patch)
tree088d70d7924c6dac0e900d4190db928623ec3c76 /include/net
parenta085ff718c8c9f14c44feb337774fadfd982e1a5 (diff)
downloadop-kernel-dev-e3c92df08cbf6a0cb60a9c7ce377378383967e07.zip
op-kernel-dev-e3c92df08cbf6a0cb60a9c7ce377378383967e07.tar.gz
mac80211: Fix tx power setting
power_level in ieee80211_conf is being used for more than one purpose. It being used as user configured power limit and the final power limit given to the driver. By doing so, except very first time, the tx power limit is taken from min(chan->max_power, local->hw.conf.power_level) which is not what we want. This patch defines a new memeber in ieee80211_conf which is meant only for user configured power limit. Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/mac80211.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 9d67fdf..ffcbd12 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -546,6 +546,7 @@ enum ieee80211_conf_changed {
* @listen_interval: listen interval in units of beacon interval
* @flags: configuration flags defined above
* @power_level: requested transmit power (in dBm)
+ * @user_power_level: User configured transmit power (in dBm)
* @channel: the channel to tune to
* @ht: the HT configuration for the device
* @long_frame_max_tx_count: Maximum number of transmissions for a "long" frame
@@ -559,6 +560,7 @@ struct ieee80211_conf {
int beacon_int;
u32 flags;
int power_level;
+ int user_power_level;
u16 listen_interval;
bool radio_enabled;
OpenPOWER on IntegriCloud