aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-4965.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-03-28 19:21:12 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-01 17:13:19 -0400
commite5472978ef16051337913f57b2f22982f3e9e4c2 (patch)
tree9ae5dd96bfe7bf2fbc989dd4429b08d879f294ef /drivers/net/wireless/iwlwifi/iwl-4965.c
parenta571ea4eb34adbf33bbaf4bdc6db6037b1a93e0f (diff)
iwlwifi: Fix synchronous host command
This patch replaces static variable from send_cmd_sync with flag in priv->status. It was used for reentrance protection but clearly made it impossible to stuck more cards into the same machine In addition it force check of return values of synchronous commands commands that doesn't requires return value async commands have to be used Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Yi Zhu <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index add6311393d3..51a144914cfa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -1314,8 +1314,8 @@ void iwl4965_chain_noise_reset(struct iwl_priv *priv)
1314 cmd.diff_gain_a = 0; 1314 cmd.diff_gain_a = 0;
1315 cmd.diff_gain_b = 0; 1315 cmd.diff_gain_b = 0;
1316 cmd.diff_gain_c = 0; 1316 cmd.diff_gain_c = 0;
1317 iwl_send_cmd_pdu(priv, REPLY_PHY_CALIBRATION_CMD, 1317 iwl_send_cmd_pdu_async(priv, REPLY_PHY_CALIBRATION_CMD,
1318 sizeof(cmd), &cmd); 1318 sizeof(cmd), &cmd, NULL);
1319 msleep(4); 1319 msleep(4);
1320 data->state = IWL_CHAIN_NOISE_ACCUMULATE; 1320 data->state = IWL_CHAIN_NOISE_ACCUMULATE;
1321 IWL_DEBUG_CALIB("Run chain_noise_calibrate\n"); 1321 IWL_DEBUG_CALIB("Run chain_noise_calibrate\n");
@@ -4563,8 +4563,8 @@ void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
4563 /* Update the rate scaling for control frame Tx to AP */ 4563 /* Update the rate scaling for control frame Tx to AP */
4564 link_cmd.sta_id = is_ap ? IWL_AP_ID : priv->hw_setting.bcast_sta_id; 4564 link_cmd.sta_id = is_ap ? IWL_AP_ID : priv->hw_setting.bcast_sta_id;
4565 4565
4566 iwl_send_cmd_pdu(priv, REPLY_TX_LINK_QUALITY_CMD, sizeof(link_cmd), 4566 iwl_send_cmd_pdu_async(priv, REPLY_TX_LINK_QUALITY_CMD,
4567 &link_cmd); 4567 sizeof(link_cmd), &link_cmd, NULL);
4568} 4568}
4569 4569
4570#ifdef CONFIG_IWL4965_HT 4570#ifdef CONFIG_IWL4965_HT