--- drivers/net/wireless/iwlwifi/iwl-4965.c

+++ drivers/net/wireless/iwlwifi/iwl-4965.c

@@ -715,6 +715,13 @@ static int iwl4965_alive_notify(struct i

iwl4965_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0);

+ /* make sure all queue are not stopped */

+ memset(&priv->queue_stopped[0], 0, sizeof(priv->queue_stopped));

+ for (i = 0; i < 4; i++)

+ atomic_set(&priv->queue_stop_count[i], 0);

+

+ /* reset to 0 to enable all the queue first */

+ priv->txq_ctx_active_msk = 0;

/* Map each Tx/cmd queue to its corresponding fifo */

for (i = 0; i < ARRAY_SIZE(default_queue_to_tx_fifo); i++) {

int ac = default_queue_to_tx_fifo[i];

@@ -2134,7 +2141,9 @@ static void iwl4965_rx_reply_tx(struct i

IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn "

"%d index %d\n", scd_ssn , index);

freed = iwl_tx_queue_reclaim(priv, txq_id, index);

- priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

+ if (qc)

+ iwl_free_tfds_in_queue(priv, sta_id,

+ tid, freed);

if (priv->mac80211_registered &&

(iwl_queue_space(&txq->q) > txq->q.low_mark) &&

@@ -2162,13 +2171,14 @@ static void iwl4965_rx_reply_tx(struct i

freed = iwl_tx_queue_reclaim(priv, txq_id, index);

if (qc && likely(sta_id != IWL_INVALID_STATION))

- priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;

+ iwl_free_tfds_in_queue(priv, sta_id, tid, freed);

+ else if (sta_id == IWL_INVALID_STATION)

+ IWL_DEBUG_TX_REPLY(priv, "Station not known\n");

if (priv->mac80211_registered &&

(iwl_queue_space(&txq->q) > txq->q.low_mark))

iwl_wake_queue(priv, txq_id);

}

-

if (qc && likely(sta_id != IWL_INVALID_STATION))

iwl_txq_check_empty(priv, sta_id, tid, txq_id);