aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-11-07 12:58:40 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-11-21 11:07:23 -0500
commit4ddbb7d060061e584cb2137f4c7e41e502a560b4 (patch)
treecb6a78a622df2660411786e73c2bbd33b187d173 /drivers/net/wireless/iwlwifi/iwl-agn.c
parent8d86422a83d79e3d3241cf0f269fca0c2640bcee (diff)
iwlwifi: revamp tx scheduler byte count tables handling
This moves byte count tables to tx domain removing completely ambivalent shared data. Changes handling of allocation byte count tables and keep warm consistent memory Moves general tx scheduler definitions from iwl-4956-hw.h to iwl-fh.h Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c1ed02e206bb..a9000f14e704 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2196,8 +2196,6 @@ static void __iwl_down(struct iwl_priv *priv)
2196 priv->cfg->ops->lib->apm_ops.stop(priv); 2196 priv->cfg->ops->lib->apm_ops.stop(priv);
2197 else 2197 else
2198 priv->cfg->ops->lib->apm_ops.reset(priv); 2198 priv->cfg->ops->lib->apm_ops.reset(priv);
2199 priv->cfg->ops->lib->free_shared_mem(priv);
2200
2201 exit: 2199 exit:
2202 memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); 2200 memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp));
2203 2201
@@ -2250,12 +2248,6 @@ static int __iwl_up(struct iwl_priv *priv)
2250 2248
2251 iwl_write32(priv, CSR_INT, 0xFFFFFFFF); 2249 iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
2252 2250
2253 ret = priv->cfg->ops->lib->alloc_shared_mem(priv);
2254 if (ret) {
2255 IWL_ERROR("Unable to allocate shared memory\n");
2256 return ret;
2257 }
2258
2259 ret = iwl_hw_nic_init(priv); 2251 ret = iwl_hw_nic_init(priv);
2260 if (ret) { 2252 if (ret) {
2261 IWL_ERROR("Unable to init nic\n"); 2253 IWL_ERROR("Unable to init nic\n");