diff options
author | Kalle Valo <kalle.valo@nokia.com> | 2009-08-07 06:35:04 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:13:41 -0400 |
commit | 16e711f9ed16e32126270652d79225836a7062cb (patch) | |
tree | 51a38780431b1964bce31723c69c03bfab0038b5 | |
parent | 4a8189227fc4718a767ffca74d13a7d552e42189 (diff) |
wl1251: use workqueue provided by mac80211
wl1251 should use workqueue created by mac80211 to not block the events
workqueue too long.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_sdio.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_spi.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index 568b640aaa52..c5f2d9dbd1a8 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/drivers/net/wireless/wl12xx/wl1251_main.c | |||
@@ -375,7 +375,7 @@ static int wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
375 | * before that, the tx_work will not be initialized! | 375 | * before that, the tx_work will not be initialized! |
376 | */ | 376 | */ |
377 | 377 | ||
378 | schedule_work(&wl->tx_work); | 378 | ieee80211_queue_work(wl->hw, &wl->tx_work); |
379 | 379 | ||
380 | /* | 380 | /* |
381 | * The workqueue is slow to process the tx_queue and we need stop | 381 | * The workqueue is slow to process the tx_queue and we need stop |
diff --git a/drivers/net/wireless/wl12xx/wl1251_sdio.c b/drivers/net/wireless/wl12xx/wl1251_sdio.c index f7e451fed8b5..20668e244c67 100644 --- a/drivers/net/wireless/wl12xx/wl1251_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1251_sdio.c | |||
@@ -55,7 +55,7 @@ static void wl1251_sdio_interrupt(struct sdio_func *func) | |||
55 | wl1251_debug(DEBUG_IRQ, "IRQ"); | 55 | wl1251_debug(DEBUG_IRQ, "IRQ"); |
56 | 56 | ||
57 | /* FIXME should be synchronous for sdio */ | 57 | /* FIXME should be synchronous for sdio */ |
58 | schedule_work(&wl->irq_work); | 58 | ieee80211_queue_work(wl->hw, &wl->irq_work); |
59 | } | 59 | } |
60 | 60 | ||
61 | static const struct sdio_device_id wl1251_devices[] = { | 61 | static const struct sdio_device_id wl1251_devices[] = { |
diff --git a/drivers/net/wireless/wl12xx/wl1251_spi.c b/drivers/net/wireless/wl12xx/wl1251_spi.c index 7d1031b7a088..e088334536aa 100644 --- a/drivers/net/wireless/wl12xx/wl1251_spi.c +++ b/drivers/net/wireless/wl12xx/wl1251_spi.c | |||
@@ -39,7 +39,7 @@ static irqreturn_t wl1251_irq(int irq, void *cookie) | |||
39 | 39 | ||
40 | wl = cookie; | 40 | wl = cookie; |
41 | 41 | ||
42 | schedule_work(&wl->irq_work); | 42 | ieee80211_queue_work(wl->hw, &wl->irq_work); |
43 | 43 | ||
44 | return IRQ_HANDLED; | 44 | return IRQ_HANDLED; |
45 | } | 45 | } |