diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 03b066c7aa3c..ad4d7d11c3b8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -2026,6 +2026,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2026 | int sta_id; | 2026 | int sta_id; |
2027 | int freed; | 2027 | int freed; |
2028 | u8 *qc = NULL; | 2028 | u8 *qc = NULL; |
2029 | unsigned long flags; | ||
2029 | 2030 | ||
2030 | if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) { | 2031 | if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) { |
2031 | IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d " | 2032 | IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d " |
@@ -2050,10 +2051,10 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2050 | return; | 2051 | return; |
2051 | } | 2052 | } |
2052 | 2053 | ||
2054 | spin_lock_irqsave(&priv->sta_lock, flags); | ||
2053 | if (txq->sched_retry) { | 2055 | if (txq->sched_retry) { |
2054 | const u32 scd_ssn = iwl4965_get_scd_ssn(tx_resp); | 2056 | const u32 scd_ssn = iwl4965_get_scd_ssn(tx_resp); |
2055 | struct iwl_ht_agg *agg = NULL; | 2057 | struct iwl_ht_agg *agg = NULL; |
2056 | |||
2057 | WARN_ON(!qc); | 2058 | WARN_ON(!qc); |
2058 | 2059 | ||
2059 | agg = &priv->stations[sta_id].tid[tid].agg; | 2060 | agg = &priv->stations[sta_id].tid[tid].agg; |
@@ -2110,6 +2111,8 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2110 | iwlagn_txq_check_empty(priv, sta_id, tid, txq_id); | 2111 | iwlagn_txq_check_empty(priv, sta_id, tid, txq_id); |
2111 | 2112 | ||
2112 | iwl_check_abort_status(priv, tx_resp->frame_count, status); | 2113 | iwl_check_abort_status(priv, tx_resp->frame_count, status); |
2114 | |||
2115 | spin_unlock_irqrestore(&priv->sta_lock, flags); | ||
2113 | } | 2116 | } |
2114 | 2117 | ||
2115 | static int iwl4965_calc_rssi(struct iwl_priv *priv, | 2118 | static int iwl4965_calc_rssi(struct iwl_priv *priv, |