dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

iwlwifi: blocking mac_start until uCode is complete 

This patch makes iwl4965_mac_start block until the uCode has been
completely loaded.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Emmanuel Grumbach 2008-06-30 17:23:24 +08:00 committed by John W. Linville
parent 06da069944
commit 154b25ce92
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/wireless/iwlwifi/iwl4965-base.c
View File

@ -2566,7 +2566,7 @@ static void iwl_bg_scan_completed(struct work_struct *work)
* *
*****************************************************************************/ *****************************************************************************/
#define UCODE_READY_TIMEOUT (2 * HZ) #define UCODE_READY_TIMEOUT (4 * HZ)
static int iwl4965_mac_start(struct ieee80211_hw *hw) static int iwl4965_mac_start(struct ieee80211_hw *hw)
{ {
@ -2619,17 +2619,15 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw)
/* Wait for START_ALIVE from Run Time ucode. Otherwise callbacks from /* Wait for START_ALIVE from Run Time ucode. Otherwise callbacks from
* mac80211 will not be run successfully. */ * mac80211 will not be run successfully. */
if (priv->ucode_type == UCODE_RT) { ret = wait_event_interruptible_timeout(priv->wait_command_queue,
ret = wait_event_interruptible_timeout(priv->wait_command_queue, test_bit(STATUS_READY, &priv->status),
test_bit(STATUS_READY, &priv->status), UCODE_READY_TIMEOUT);
UCODE_READY_TIMEOUT); if (!ret) {
if (!ret) { if (!test_bit(STATUS_READY, &priv->status)) {
if (!test_bit(STATUS_READY, &priv->status)) { IWL_ERROR("START_ALIVE timeout after %dms.\n",
IWL_ERROR("START_ALIVE timeout after %dms.\n", jiffies_to_msecs(UCODE_READY_TIMEOUT));
jiffies_to_msecs(UCODE_READY_TIMEOUT)); ret = -ETIMEDOUT;
ret = -ETIMEDOUT; goto out_release_irq;
goto out_release_irq;
}
} }
priv->is_open = 1; priv->is_open = 1;