aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-06-28 11:58:41 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-07-01 10:57:59 -0400
commit02aca585f58a331288026cf78fd4f4ca404cbe12 (patch)
treef78bddb8d39c6d7ca3e2b4229ecc7cd7e59a6ff7 /drivers/net/wireless/iwlwifi/iwl-agn-lib.c
parenta0f6b0a211fbdfbae603ffa434f0d9e691e55ab9 (diff)
iwlagn: move the tx allocation funcs to the transport layer
These functions allocate all the Tx context. Only the simple tx_init is exported as API. 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-lib.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index a2c5c6b6cd3a..ea83aa5bf29c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -699,7 +699,6 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv)
699{ 699{
700 unsigned long flags; 700 unsigned long flags;
701 struct iwl_rx_queue *rxq = &priv->rxq; 701 struct iwl_rx_queue *rxq = &priv->rxq;
702 int ret;
703 702
704 /* nic_init */ 703 /* nic_init */
705 spin_lock_irqsave(&priv->lock, flags); 704 spin_lock_irqsave(&priv->lock, flags);
@@ -729,12 +728,8 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv)
729 spin_unlock_irqrestore(&priv->lock, flags); 728 spin_unlock_irqrestore(&priv->lock, flags);
730 729
731 /* Allocate or reset and init all Tx and Command queues */ 730 /* Allocate or reset and init all Tx and Command queues */
732 if (!priv->txq) { 731 if (priv->trans.ops->tx_init(priv))
733 ret = iwlagn_txq_ctx_alloc(priv); 732 return -ENOMEM;
734 if (ret)
735 return ret;
736 } else
737 iwlagn_txq_ctx_reset(priv);
738 733
739 if (priv->cfg->base_params->shadow_reg_enable) { 734 if (priv->cfg->base_params->shadow_reg_enable) {
740 /* enable shadow regs in HW */ 735 /* enable shadow regs in HW */