aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-03-18 12:05:00 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-03-30 15:37:30 -0400
commitbe6b38bcb175613f239e0b302607db346472c6b6 (patch)
treedf7021ee513d2bb4a28dac5c6ed6bccc9d11e888 /drivers/net
parentf6c8f1523a2de3b84340e45913cbcee8bee74570 (diff)
iwlwifi: counting number of tfds can be free for 4965
Forget one hunk in 4965 during "iwlwifi: error checking for number of tfds in queue" patch. Reported-by: Shanyu Zhao <shanyu.zhao@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> CC: stable@kernel.org
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 1bd2cd836026..83c52a682622 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2041,16 +2041,14 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
2041 tx_resp->failure_frame); 2041 tx_resp->failure_frame);
2042 2042
2043 freed = iwl_tx_queue_reclaim(priv, txq_id, index); 2043 freed = iwl_tx_queue_reclaim(priv, txq_id, index);
2044 if (qc && likely(sta_id != IWL_INVALID_STATION)) 2044 iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
2045 priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
2046 2045
2047 if (priv->mac80211_registered && 2046 if (priv->mac80211_registered &&
2048 (iwl_queue_space(&txq->q) > txq->q.low_mark)) 2047 (iwl_queue_space(&txq->q) > txq->q.low_mark))
2049 iwl_wake_queue(priv, txq_id); 2048 iwl_wake_queue(priv, txq_id);
2050 } 2049 }
2051 2050
2052 if (qc && likely(sta_id != IWL_INVALID_STATION)) 2051 iwl_txq_check_empty(priv, sta_id, tid, txq_id);
2053 iwl_txq_check_empty(priv, sta_id, tid, txq_id);
2054 2052
2055 if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) 2053 if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
2056 IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n"); 2054 IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n");