summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJay Sternberg <jay.e.sternberg@linux.intel.com>2008-12-17 11:52:34 +0300
committerJohn W. Linville <linville@tuxdriver.com>2008-12-19 23:23:42 +0300
commit91f39e8eea725347b6a82d1e35e512ec8b298b0b (patch)
tree7fa577f135b1a1a45e794c066a6b58eb46ea2c77 /drivers
parentf1bc4ac61f2c08515afd80c6dc3962aa6d0b138b (diff)
downloadlinux-91f39e8eea725347b6a82d1e35e512ec8b298b0b.tar.xz
iwlwifi: indicate txpower is off in sysfs
The patch checks if the radio is disabled before displaying the tx power level. Previously when the txpower was set off show_tx_power still returned the prior power level. Now it will indicate the power has been turned off. Signed-off-by: Jay Sternberg <jay.e.sternberg@linux.intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index ff8635f0ed45..5da6b35cd26d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3418,7 +3418,11 @@ static ssize_t show_tx_power(struct device *d,
struct device_attribute *attr, char *buf)
{
struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
- return sprintf(buf, "%d\n", priv->tx_power_user_lmt);
+
+ if (!iwl_is_ready_rf(priv))
+ return sprintf(buf, "off\n");
+ else
+ return sprintf(buf, "%d\n", priv->tx_power_user_lmt);
}
static ssize_t store_tx_power(struct device *d,