diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-02-26 16:54:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-26 16:54:45 -0500 |
| commit | 64463da913bc8f791980ba28d93ac5e716ab9cc5 (patch) | |
| tree | cf958678f7cf0b615a52356beb2d18240424ab4a /drivers/net/wireless/iwlwifi/iwl-4965.c | |
| parent | 4a6967b88af02eebeedfbb91bc09160750225bb5 (diff) | |
| parent | a120e912eb51e347f36c71b60a1d13af74d30e83 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
net/mac80211/rate.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 17e91ad3496c..1bd2cd836026 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
| @@ -2015,7 +2015,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
| 2015 | IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn " | 2015 | IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn " |
| 2016 | "%d index %d\n", scd_ssn , index); | 2016 | "%d index %d\n", scd_ssn , index); |
| 2017 | freed = iwl_tx_queue_reclaim(priv, txq_id, index); | 2017 | freed = iwl_tx_queue_reclaim(priv, txq_id, index); |
| 2018 | priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; | 2018 | iwl_free_tfds_in_queue(priv, sta_id, tid, freed); |
| 2019 | 2019 | ||
| 2020 | if (priv->mac80211_registered && | 2020 | if (priv->mac80211_registered && |
| 2021 | (iwl_queue_space(&txq->q) > txq->q.low_mark) && | 2021 | (iwl_queue_space(&txq->q) > txq->q.low_mark) && |