aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYogesh Ashok Powar <yogeshp@marvell.com>2013-01-25 05:47:45 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-01-30 15:06:48 -0500
commit0f4316b97d045e9b5b270cafa4b924769699eb3d (patch)
tree12433b49c186a0a1d19236ee03feda10690038f6 /drivers
parente882efc96dba0a48adbe460b04d552d9a749a7c0 (diff)
mwl8k: Do not call mwl8k_cmd_set_rf_channel unconditionally
Avoid calling mwl8k_cmd_set_rf_channel unconditionally by checking IEEE80211_CONF_CHANGE_CHANNEL. Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com> Signed-off-by: Nishant Sarmukadam <nishants@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/mwl8k.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 398b8b19ff84..78a89f6426b1 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -4797,9 +4797,11 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)
4797 if (rc) 4797 if (rc)
4798 goto out; 4798 goto out;
4799 4799
4800 rc = mwl8k_cmd_set_rf_channel(hw, conf); 4800 if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
4801 if (rc) 4801 rc = mwl8k_cmd_set_rf_channel(hw, conf);
4802 goto out; 4802 if (rc)
4803 goto out;
4804 }
4803 4805
4804 if (conf->power_level > 18) 4806 if (conf->power_level > 18)
4805 conf->power_level = 18; 4807 conf->power_level = 18;