diff --git a/[refs] b/[refs] index 38151a8b6f6d..48818a79e731 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 990aa6d7b28d26bf22171410b49f191e8e9b09fc +refs/heads/master: c61259858d685caf865e9819e3d3062a0865d93c diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c b/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c index 1eed9882b7b8..a2cdb934df61 100644 --- a/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -203,6 +203,9 @@ static int iwl_rx_init(struct iwl_trans *trans) INIT_LIST_HEAD(&rxq->rx_free); INIT_LIST_HEAD(&rxq->rx_used); + INIT_WORK(&trans_pcie->rx_replenish, + iwl_pcie_rx_replenish_work); + iwl_trans_rxq_free_rx_bufs(trans); for (i = 0; i < RX_QUEUE_SIZE; i++) @@ -1449,8 +1452,6 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans) goto error; } - INIT_WORK(&trans_pcie->rx_replenish, - iwl_pcie_rx_replenish_work); trans_pcie->irq_requested = true; }