aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-02-17 13:07:44 -0500
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-02-17 13:10:28 -0500
commit1ee158d83853a9f5c1465be56d56ff56e6698e92 (patch)
tree15893fd02e9ac0ae42649c8725f66670ed7ba2a7 /drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
parent2655e314c4b204966008689eaf3e87ba1f38d55c (diff)
iwlwifi: move workqueue to priv
In order to separate the different parts of the driver better, we are reducing the shared data. This moves the workqueue to "priv", and removes it from the transport. To do this, simply use schedule_work() in the transport. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 3826852ec5f0..1b11cfec5da6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -227,7 +227,7 @@ static void iwlagn_rx_queue_restock(struct iwl_trans *trans)
227 /* If the pre-allocated buffer pool is dropping low, schedule to 227 /* If the pre-allocated buffer pool is dropping low, schedule to
228 * refill it */ 228 * refill it */
229 if (rxq->free_count <= RX_LOW_WATERMARK) 229 if (rxq->free_count <= RX_LOW_WATERMARK)
230 queue_work(trans->shrd->workqueue, &trans_pcie->rx_replenish); 230 schedule_work(&trans_pcie->rx_replenish);
231 231
232 232
233 /* If we've added more space for the firmware to place data, tell it. 233 /* If we've added more space for the firmware to place data, tell it.
@@ -351,14 +351,8 @@ void iwl_bg_rx_replenish(struct work_struct *data)
351{ 351{
352 struct iwl_trans_pcie *trans_pcie = 352 struct iwl_trans_pcie *trans_pcie =
353 container_of(data, struct iwl_trans_pcie, rx_replenish); 353 container_of(data, struct iwl_trans_pcie, rx_replenish);
354 struct iwl_trans *trans = trans_pcie->trans;
355 354
356 if (test_bit(STATUS_EXIT_PENDING, &trans->shrd->status)) 355 iwlagn_rx_replenish(trans_pcie->trans);
357 return;
358
359 mutex_lock(&trans->shrd->mutex);
360 iwlagn_rx_replenish(trans);
361 mutex_unlock(&trans->shrd->mutex);
362} 356}
363 357
364/** 358/**