aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-08-26 02:10:39 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-29 15:25:30 -0400
commitd618912417fbce4f6514fe1cbef7df2e73bdb6c2 (patch)
treee14bf2a7a09d898431cd0bac6d8b38318cb6dc48 /drivers/net/wireless/iwlwifi/iwl-agn-tx.c
parent8f470ce31de1a9dfe6b53e0967eaa7e72b741714 (diff)
iwlagn: hw_params moves to iwl_shared
Since it is used by all the layers, it needs to move to iwl_shared. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> 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-agn-tx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-tx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 9bc26da62768..3e2a9040de1b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -260,10 +260,10 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
260 priv->bt_full_concurrent) { 260 priv->bt_full_concurrent) {
261 /* operated as 1x1 in full concurrency mode */ 261 /* operated as 1x1 in full concurrency mode */
262 priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant, 262 priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
263 first_antenna(priv->hw_params.valid_tx_ant)); 263 first_antenna(hw_params(priv).valid_tx_ant));
264 } else 264 } else
265 priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant, 265 priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
266 priv->hw_params.valid_tx_ant); 266 hw_params(priv).valid_tx_ant);
267 rate_flags |= iwl_ant_idx_to_flags(priv->mgmt_tx_ant); 267 rate_flags |= iwl_ant_idx_to_flags(priv->mgmt_tx_ant);
268 268
269 /* Set the rate in the TX cmd */ 269 /* Set the rate in the TX cmd */
@@ -492,7 +492,7 @@ static int iwlagn_txq_ctx_activate_free(struct iwl_priv *priv)
492{ 492{
493 int txq_id; 493 int txq_id;
494 494
495 for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) 495 for (txq_id = 0; txq_id < hw_params(priv).max_txq_num; txq_id++)
496 if (!test_and_set_bit(txq_id, &priv->txq_ctx_active_msk)) 496 if (!test_and_set_bit(txq_id, &priv->txq_ctx_active_msk))
497 return txq_id; 497 return txq_id;
498 return -1; 498 return -1;
@@ -864,7 +864,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
864 * (in Tx queue's circular buffer) of first TFD/frame in window */ 864 * (in Tx queue's circular buffer) of first TFD/frame in window */
865 u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn); 865 u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);
866 866
867 if (scd_flow >= priv->hw_params.max_txq_num) { 867 if (scd_flow >= hw_params(priv).max_txq_num) {
868 IWL_ERR(priv, 868 IWL_ERR(priv,
869 "BUG_ON scd_flow is bigger than number of queues\n"); 869 "BUG_ON scd_flow is bigger than number of queues\n");
870 return; 870 return;