Skip to content

Commit

Permalink
iwl3945: delay mode setting
Browse files Browse the repository at this point in the history
Delay mode setting till uCode is ready.

Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Abhijeet Kolekar authored and John W. Linville committed Apr 22, 2009
1 parent e0158e6 commit f45c271
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/wireless/iwlwifi/iwl3945-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -2758,6 +2758,9 @@ static void iwl3945_alive_start(struct iwl_priv *priv)
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;

restart:
Expand Down Expand Up @@ -3497,8 +3500,8 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
}

if (iwl_is_ready(priv))
iwl3945_set_mode(priv, conf->type);
if (iwl3945_set_mode(priv, conf->type) == -EAGAIN)
set_bit(STATUS_MODE_PENDING, &priv->status);

mutex_unlock(&priv->mutex);

Expand Down

0 comments on commit f45c271

Please sign in to comment.