aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-11-14 07:28:50 -0500
committerJohannes Berg <johannes.berg@intel.com>2012-11-19 09:01:53 -0500
commitc61259858d685caf865e9819e3d3062a0865d93c (patch)
treefebc1d9cb92e462a1b397f7107ecc561460e1ce3
parent990aa6d7b28d26bf22171410b49f191e8e9b09fc (diff)
iwlwifi: init the replenish work in rx_init
This is its natural place Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/trans.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 1eed9882b7b8..a2cdb934df61 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -203,6 +203,9 @@ static int iwl_rx_init(struct iwl_trans *trans)
203 INIT_LIST_HEAD(&rxq->rx_free); 203 INIT_LIST_HEAD(&rxq->rx_free);
204 INIT_LIST_HEAD(&rxq->rx_used); 204 INIT_LIST_HEAD(&rxq->rx_used);
205 205
206 INIT_WORK(&trans_pcie->rx_replenish,
207 iwl_pcie_rx_replenish_work);
208
206 iwl_trans_rxq_free_rx_bufs(trans); 209 iwl_trans_rxq_free_rx_bufs(trans);
207 210
208 for (i = 0; i < RX_QUEUE_SIZE; i++) 211 for (i = 0; i < RX_QUEUE_SIZE; i++)
@@ -1449,8 +1452,6 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
1449 goto error; 1452 goto error;
1450 } 1453 }
1451 1454
1452 INIT_WORK(&trans_pcie->rx_replenish,
1453 iwl_pcie_rx_replenish_work);
1454 trans_pcie->irq_requested = true; 1455 trans_pcie->irq_requested = true;
1455 } 1456 }
1456 1457