diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-06-28 08:58:41 -0700 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-01 07:57:59 -0700 |
| commit | 02aca585f58a331288026cf78fd4f4ca404cbe12 (patch) | |
| tree | f78bddb8d39c6d7ca3e2b4229ecc7cd7e59a6ff7 /drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |
| parent | a0f6b0a211fbdfbae603ffa434f0d9e691e55ab9 (diff) | |
| download | linux-02aca585f58a331288026cf78fd4f4ca404cbe12.tar.gz linux-02aca585f58a331288026cf78fd4f4ca404cbe12.tar.bz2 linux-02aca585f58a331288026cf78fd4f4ca404cbe12.zip | |
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.c | 9 |
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) { unsigned long flags; struct iwl_rx_queue *rxq = &priv->rxq; - int ret; /* nic_init */ spin_lock_irqsave(&priv->lock, flags); @@ -729,12 +728,8 @@ int iwlagn_hw_nic_init(struct iwl_priv *priv) spin_unlock_irqrestore(&priv->lock, flags); /* Allocate or reset and init all Tx and Command queues */ - if (!priv->txq) { - ret = iwlagn_txq_ctx_alloc(priv); - if (ret) - return ret; - } else - iwlagn_txq_ctx_reset(priv); + if (priv->trans.ops->tx_init(priv)) + return -ENOMEM; if (priv->cfg->base_params->shadow_reg_enable) { /* enable shadow regs in HW */ |