lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwl3945: use changed in iwl3945_mac_config

Browse Source 
In function iwl3945_mac_config use changed flag to call only
the affected functions.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Mohamed Abbas
2009-03-17 21:51:42 -07:00
committed by John W. Linville
parent 019fb97d47
commit 37fec3846a
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@@ -3773,15 +3773,19 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed)
} }
#endif #endif
if (conf->radio_enabled && iwl_radio_kill_sw_enable_radio(priv)) { if (changed & IEEE80211_CONF_CHANGE_RADIO_ENABLED) {
IWL_DEBUG_MAC80211(priv, "leave - RF-KILL - waiting for uCode\n"); if (conf->radio_enabled &&
goto out; iwl_radio_kill_sw_enable_radio(priv)) {
} IWL_DEBUG_MAC80211(priv, "leave - RF-KILL - "
"waiting for uCode\n");
goto out;
}
if (!conf->radio_enabled) { if (!conf->radio_enabled) {
iwl_radio_kill_sw_disable_radio(priv); iwl_radio_kill_sw_disable_radio(priv);
IWL_DEBUG_MAC80211(priv, "leave - radio disabled\n"); IWL_DEBUG_MAC80211(priv, "leave - radio disabled\n");
goto out; goto out;
}
} }
if (iwl_is_rfkill(priv)) { if (iwl_is_rfkill(priv)) {