From: Nishant Sarmukadam <nishants@marvell.com>
Date: Tue, 5 Apr 2011 08:48:09 +0000 (+0530)
Subject: mwl8k: Do not configure tx power unconditionally
X-Git-Tag: firefly_0821_release~7613^2~967^2~16^2~518
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0321708748d8f2ecfffa4a9feafb332312e4e57f;p=firefly-linux-kernel-4.4.55.git

mwl8k: Do not configure tx power unconditionally

Instead of configuring tx power unconditionally, check for
IEEE80211_CONF_CHANGE_POWER and configure it only when stack
sets this flag

Signed-off-by: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index ae56d2f32b2e..d5e047970345 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -4463,9 +4463,12 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)
 		conf->power_level = 18;
 
 	if (priv->ap_fw) {
-		rc = mwl8k_cmd_tx_power(hw, conf, conf->power_level);
-		if (rc)
-			goto out;
+
+		if (conf->flags & IEEE80211_CONF_CHANGE_POWER) {
+			rc = mwl8k_cmd_tx_power(hw, conf, conf->power_level);
+			if (rc)
+				goto out;
+		}
 
 		rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_RX, 0x3);
 		if (rc)