Commit 37fec384 authored by Mohamed Abbas's avatar Mohamed Abbas Committed by John W. Linville

iwl3945: use changed in iwl3945_mac_config

In function iwl3945_mac_config use changed flag to call only
the affected functions.
Signed-off-by: default avatarMohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 019fb97d
...@@ -3773,15 +3773,19 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed) ...@@ -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)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment