diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-03-17 16:34:35 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-25 14:19:33 -0400 |
commit | 54b81550dd674466fe7d01629d2aab015c545a1e (patch) | |
tree | ed589d93ecef142f95379170e35e3224fd580fb4 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 74bcdb33e99f49ef5202dd2f8109945b4570edc2 (diff) |
iwlwifi: move agn only rx functions from iwlcore to iwlagn
Identify the rx 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-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index a57933b8f6fa..d9a287b639bf 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1015,7 +1015,7 @@ void iwl_rx_handle(struct iwl_priv *priv) | |||
1015 | count++; | 1015 | count++; |
1016 | if (count >= 8) { | 1016 | if (count >= 8) { |
1017 | rxq->read = i; | 1017 | rxq->read = i; |
1018 | iwl_rx_replenish_now(priv); | 1018 | iwlagn_rx_replenish_now(priv); |
1019 | count = 0; | 1019 | count = 0; |
1020 | } | 1020 | } |
1021 | } | 1021 | } |
@@ -1024,9 +1024,9 @@ void iwl_rx_handle(struct iwl_priv *priv) | |||
1024 | /* Backtrack one entry */ | 1024 | /* Backtrack one entry */ |
1025 | rxq->read = i; | 1025 | rxq->read = i; |
1026 | if (fill_rx) | 1026 | if (fill_rx) |
1027 | iwl_rx_replenish_now(priv); | 1027 | iwlagn_rx_replenish_now(priv); |
1028 | else | 1028 | else |
1029 | iwl_rx_queue_restock(priv); | 1029 | iwlagn_rx_queue_restock(priv); |
1030 | } | 1030 | } |
1031 | 1031 | ||
1032 | /* call this function to flush any scheduled tasklet */ | 1032 | /* call this function to flush any scheduled tasklet */ |
@@ -2250,7 +2250,7 @@ static void __iwl_down(struct iwl_priv *priv) | |||
2250 | iwl_disable_ict(priv); | 2250 | iwl_disable_ict(priv); |
2251 | 2251 | ||
2252 | iwlagn_txq_ctx_stop(priv); | 2252 | iwlagn_txq_ctx_stop(priv); |
2253 | iwl_rxq_stop(priv); | 2253 | iwlagn_rxq_stop(priv); |
2254 | 2254 | ||
2255 | /* Power-down device's busmaster DMA clocks */ | 2255 | /* Power-down device's busmaster DMA clocks */ |
2256 | iwl_write_prph(priv, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT); | 2256 | iwl_write_prph(priv, APMG_CLK_DIS_REG, APMG_CLK_VAL_DMA_CLK_RQT); |
@@ -2521,7 +2521,7 @@ static void iwl_bg_rx_replenish(struct work_struct *data) | |||
2521 | return; | 2521 | return; |
2522 | 2522 | ||
2523 | mutex_lock(&priv->mutex); | 2523 | mutex_lock(&priv->mutex); |
2524 | iwl_rx_replenish(priv); | 2524 | iwlagn_rx_replenish(priv); |
2525 | mutex_unlock(&priv->mutex); | 2525 | mutex_unlock(&priv->mutex); |
2526 | } | 2526 | } |
2527 | 2527 | ||
@@ -3737,7 +3737,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev) | |||
3737 | iwl_dealloc_ucode_pci(priv); | 3737 | iwl_dealloc_ucode_pci(priv); |
3738 | 3738 | ||
3739 | if (priv->rxq.bd) | 3739 | if (priv->rxq.bd) |
3740 | iwl_rx_queue_free(priv, &priv->rxq); | 3740 | iwlagn_rx_queue_free(priv, &priv->rxq); |
3741 | iwlagn_hw_txq_ctx_free(priv); | 3741 | iwlagn_hw_txq_ctx_free(priv); |
3742 | 3742 | ||
3743 | iwl_eeprom_free(priv); | 3743 | iwl_eeprom_free(priv); |