diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-03-17 16:34:34 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-25 14:19:27 -0400 |
commit | 74bcdb33e99f49ef5202dd2f8109945b4570edc2 (patch) | |
tree | 0c1be859e04b0c460abd9cbf1f40571362c82956 /drivers/net/wireless/iwlwifi/iwl-core.c | |
parent | 348ee7cd57831c47373dd157f138c558daaf129d (diff) |
iwlwifi: move agn only tx functions from iwlcore to iwlagn
Identify the tx functions only used by agn driver and move those from
iwlcore to iwlagn.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 5180fb24cd38..0dc41d84dc15 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -265,57 +265,6 @@ void iwl_hw_detect(struct iwl_priv *priv) | |||
265 | } | 265 | } |
266 | EXPORT_SYMBOL(iwl_hw_detect); | 266 | EXPORT_SYMBOL(iwl_hw_detect); |
267 | 267 | ||
268 | int iwl_hw_nic_init(struct iwl_priv *priv) | ||
269 | { | ||
270 | unsigned long flags; | ||
271 | struct iwl_rx_queue *rxq = &priv->rxq; | ||
272 | int ret; | ||
273 | |||
274 | /* nic_init */ | ||
275 | spin_lock_irqsave(&priv->lock, flags); | ||
276 | priv->cfg->ops->lib->apm_ops.init(priv); | ||
277 | |||
278 | /* Set interrupt coalescing calibration timer to default (512 usecs) */ | ||
279 | iwl_write8(priv, CSR_INT_COALESCING, IWL_HOST_INT_CALIB_TIMEOUT_DEF); | ||
280 | |||
281 | spin_unlock_irqrestore(&priv->lock, flags); | ||
282 | |||
283 | ret = priv->cfg->ops->lib->apm_ops.set_pwr_src(priv, IWL_PWR_SRC_VMAIN); | ||
284 | |||
285 | priv->cfg->ops->lib->apm_ops.config(priv); | ||
286 | |||
287 | /* Allocate the RX queue, or reset if it is already allocated */ | ||
288 | if (!rxq->bd) { | ||
289 | ret = iwl_rx_queue_alloc(priv); | ||
290 | if (ret) { | ||
291 | IWL_ERR(priv, "Unable to initialize Rx queue\n"); | ||
292 | return -ENOMEM; | ||
293 | } | ||
294 | } else | ||
295 | iwl_rx_queue_reset(priv, rxq); | ||
296 | |||
297 | iwl_rx_replenish(priv); | ||
298 | |||
299 | iwl_rx_init(priv, rxq); | ||
300 | |||
301 | spin_lock_irqsave(&priv->lock, flags); | ||
302 | |||
303 | rxq->need_update = 1; | ||
304 | iwl_rx_queue_update_write_ptr(priv, rxq); | ||
305 | |||
306 | spin_unlock_irqrestore(&priv->lock, flags); | ||
307 | |||
308 | /* Allocate and init all Tx and Command queues */ | ||
309 | ret = iwl_txq_ctx_reset(priv); | ||
310 | if (ret) | ||
311 | return ret; | ||
312 | |||
313 | set_bit(STATUS_INIT, &priv->status); | ||
314 | |||
315 | return 0; | ||
316 | } | ||
317 | EXPORT_SYMBOL(iwl_hw_nic_init); | ||
318 | |||
319 | /* | 268 | /* |
320 | * QoS support | 269 | * QoS support |
321 | */ | 270 | */ |