aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-04-18 10:28:17 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-04-18 10:29:43 -0400
commit68e8dfdadb424fd76ca81eeb399c3228adc5cea2 (patch)
treee8b641240ec3cdf61aa218d2c9d7e9c340683f69 /drivers/net/wireless/iwlwifi/iwl-agn-tx.c
parent9130bab137844d9ad3db6ab524de299cd2b9e39d (diff)
iwlwifi: op_mode holds its pointer to the transport
Instead of using the shared area that we be killed. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-tx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-tx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index ad21b5ddf59d..f6041ca63af8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -467,7 +467,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
467 else 467 else
468 txq_id = ctx->ac_to_queue[skb_get_queue_mapping(skb)]; 468 txq_id = ctx->ac_to_queue[skb_get_queue_mapping(skb)];
469 469
470 if (iwl_trans_tx(trans(priv), skb, dev_cmd, txq_id)) 470 if (iwl_trans_tx(priv->trans, skb, dev_cmd, txq_id))
471 goto drop_unlock_sta; 471 goto drop_unlock_sta;
472 472
473 if (ieee80211_is_data_qos(fc) && !ieee80211_is_qos_nullfunc(fc) && 473 if (ieee80211_is_data_qos(fc) && !ieee80211_is_qos_nullfunc(fc) &&
@@ -581,7 +581,7 @@ turn_off:
581 spin_unlock_bh(&priv->sta_lock); 581 spin_unlock_bh(&priv->sta_lock);
582 582
583 if (test_bit(txq_id, priv->agg_q_alloc)) { 583 if (test_bit(txq_id, priv->agg_q_alloc)) {
584 iwl_trans_tx_agg_disable(trans(priv), txq_id); 584 iwl_trans_tx_agg_disable(priv->trans, txq_id);
585 iwlagn_dealloc_agg_txq(priv, txq_id); 585 iwlagn_dealloc_agg_txq(priv, txq_id);
586 } 586 }
587 587
@@ -665,7 +665,7 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,
665 665
666 fifo = ctx->ac_to_fifo[tid_to_ac[tid]]; 666 fifo = ctx->ac_to_fifo[tid_to_ac[tid]];
667 667
668 iwl_trans_tx_agg_setup(trans(priv), q, fifo, 668 iwl_trans_tx_agg_setup(priv->trans, q, fifo,
669 sta_priv->sta_id, tid, 669 sta_priv->sta_id, tid,
670 buf_size, ssn); 670 buf_size, ssn);
671 671
@@ -732,7 +732,7 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid)
732 IWL_DEBUG_TX_QUEUES(priv, 732 IWL_DEBUG_TX_QUEUES(priv,
733 "Can continue DELBA flow ssn = next_recl =" 733 "Can continue DELBA flow ssn = next_recl ="
734 " %d", tid_data->next_reclaimed); 734 " %d", tid_data->next_reclaimed);
735 iwl_trans_tx_agg_disable(trans(priv), 735 iwl_trans_tx_agg_disable(priv->trans,
736 tid_data->agg.txq_id); 736 tid_data->agg.txq_id);
737 iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id); 737 iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id);
738 tid_data->agg.state = IWL_AGG_OFF; 738 tid_data->agg.state = IWL_AGG_OFF;
@@ -1092,7 +1092,7 @@ static int iwl_reclaim(struct iwl_priv *priv, int sta_id, int tid,
1092 return 1; 1092 return 1;
1093 } 1093 }
1094 1094
1095 iwl_trans_reclaim(trans(priv), txq_id, ssn, skbs); 1095 iwl_trans_reclaim(priv->trans, txq_id, ssn, skbs);
1096 return 0; 1096 return 0;
1097} 1097}
1098 1098