Commit f45c2714 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwl3945: delay mode setting



Delay mode setting till uCode is ready.
Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e0158e61
...@@ -2758,6 +2758,9 @@ static void iwl3945_alive_start(struct iwl_priv *priv) ...@@ -2758,6 +2758,9 @@ static void iwl3945_alive_start(struct iwl_priv *priv)
iwl_mac_beacon_update(priv->hw, beacon); iwl_mac_beacon_update(priv->hw, beacon);
} }
if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
iwl3945_set_mode(priv, priv->iw_mode);
return; return;
restart: restart:
...@@ -3497,8 +3500,8 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw, ...@@ -3497,8 +3500,8 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN); memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
} }
if (iwl_is_ready(priv)) if (iwl3945_set_mode(priv, conf->type) == -EAGAIN)
iwl3945_set_mode(priv, conf->type); set_bit(STATUS_MODE_PENDING, &priv->status);
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
......
Supports Markdown
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