aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2009-10-08 14:56:29 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:47:52 -0400
commita64b07e8c6ff8394cd8c5a505b9f04d945f9f30f (patch)
tree31521dee7a5faf408f78343e491883cf704b746a /drivers/net
parent64a7f67287c75f5bb28018a6ff2750a59ee1195a (diff)
wl1271: use workqueue provided by mac80211 instead of the default
Use the workqueue provided by the mac80211 stack instead of the system default queue. Modified to use new ieee_queue_work() as required by changes in the stack. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 1a0491a01baa..d1042305abcc 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -107,7 +107,7 @@ static void wl1271_fw_status(struct wl1271 *wl, struct wl1271_fw_status *status)
107 107
108 /* if more blocks are available now, schedule some tx work */ 108 /* if more blocks are available now, schedule some tx work */
109 if (total && !skb_queue_empty(&wl->tx_queue)) 109 if (total && !skb_queue_empty(&wl->tx_queue))
110 schedule_work(&wl->tx_work); 110 ieee80211_queue_work(wl->hw, &wl->tx_work);
111 111
112 /* update the host-chipset time offset */ 112 /* update the host-chipset time offset */
113 wl->time_offset = jiffies_to_usecs(jiffies) - status->fw_localtime; 113 wl->time_offset = jiffies_to_usecs(jiffies) - status->fw_localtime;
@@ -205,7 +205,7 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
205 wl->elp_compl = NULL; 205 wl->elp_compl = NULL;
206 } 206 }
207 207
208 schedule_work(&wl->irq_work); 208 ieee80211_queue_work(wl->hw, &wl->irq_work);
209 spin_unlock_irqrestore(&wl->wl_lock, flags); 209 spin_unlock_irqrestore(&wl->wl_lock, flags);
210 210
211 return IRQ_HANDLED; 211 return IRQ_HANDLED;
@@ -480,7 +480,7 @@ static int wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
480 * before that, the tx_work will not be initialized! 480 * before that, the tx_work will not be initialized!
481 */ 481 */
482 482
483 schedule_work(&wl->tx_work); 483 ieee80211_queue_work(wl->hw, &wl->tx_work);
484 484
485 /* 485 /*
486 * The workqueue is slow to process the tx_queue and we need stop 486 * The workqueue is slow to process the tx_queue and we need stop