diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-03-09 11:13:40 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-09 14:25:14 -0500 |
| commit | 1745e4405b2c0da6db2ec4b6bc0ad930612d8295 (patch) | |
| tree | 19b38b1378f009c3ed8fde8a1631e892b8794e15 /drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | |
| parent | 9ba1947a89938ee83e7c16709ee4095ae3e36c44 (diff) | |
| download | op-kernel-dev-1745e4405b2c0da6db2ec4b6bc0ad930612d8295.zip op-kernel-dev-1745e4405b2c0da6db2ec4b6bc0ad930612d8295.tar.gz | |
iwlwifi: fix the delta for remove max_txq_num patch
BIg portion of "iwlwifi: remove max_txq_num from hw_params" was
missing during merge, here is the fix for it.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index 2b1df00..565c664 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c @@ -595,7 +595,8 @@ static int iwlagn_txq_ctx_activate_free(struct iwl_trans *trans) struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); int txq_id; - for (txq_id = 0; txq_id < hw_params(trans).max_txq_num; txq_id++) + for (txq_id = 0; txq_id < cfg(trans)->base_params->num_of_queues; + txq_id++) if (!test_and_set_bit(txq_id, &trans_pcie->txq_ctx_active_msk)) return txq_id; |
