diff options
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 3f4360ad0e4e..f985938962e3 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -1654,7 +1654,7 @@ static void b43_update_templates(struct b43_wl *wl) | |||
1654 | wl->current_beacon = beacon; | 1654 | wl->current_beacon = beacon; |
1655 | wl->beacon0_uploaded = 0; | 1655 | wl->beacon0_uploaded = 0; |
1656 | wl->beacon1_uploaded = 0; | 1656 | wl->beacon1_uploaded = 0; |
1657 | queue_work(wl->hw->workqueue, &wl->beacon_update_trigger); | 1657 | ieee80211_queue_work(wl->hw, &wl->beacon_update_trigger); |
1658 | } | 1658 | } |
1659 | 1659 | ||
1660 | static void b43_set_beacon_int(struct b43_wldev *dev, u16 beacon_int) | 1660 | static void b43_set_beacon_int(struct b43_wldev *dev, u16 beacon_int) |
@@ -2914,7 +2914,7 @@ out_requeue: | |||
2914 | delay = msecs_to_jiffies(50); | 2914 | delay = msecs_to_jiffies(50); |
2915 | else | 2915 | else |
2916 | delay = round_jiffies_relative(HZ * 15); | 2916 | delay = round_jiffies_relative(HZ * 15); |
2917 | queue_delayed_work(wl->hw->workqueue, &dev->periodic_work, delay); | 2917 | ieee80211_queue_delayed_work(wl->hw, &dev->periodic_work, delay); |
2918 | out: | 2918 | out: |
2919 | mutex_unlock(&wl->mutex); | 2919 | mutex_unlock(&wl->mutex); |
2920 | } | 2920 | } |
@@ -2925,7 +2925,7 @@ static void b43_periodic_tasks_setup(struct b43_wldev *dev) | |||
2925 | 2925 | ||
2926 | dev->periodic_state = 0; | 2926 | dev->periodic_state = 0; |
2927 | INIT_DELAYED_WORK(work, b43_periodic_work_handler); | 2927 | INIT_DELAYED_WORK(work, b43_periodic_work_handler); |
2928 | queue_delayed_work(dev->wl->hw->workqueue, work, 0); | 2928 | ieee80211_queue_delayed_work(dev->wl->hw, work, 0); |
2929 | } | 2929 | } |
2930 | 2930 | ||
2931 | /* Check if communication with the device works correctly. */ | 2931 | /* Check if communication with the device works correctly. */ |
@@ -4871,7 +4871,7 @@ void b43_controller_restart(struct b43_wldev *dev, const char *reason) | |||
4871 | if (b43_status(dev) < B43_STAT_INITIALIZED) | 4871 | if (b43_status(dev) < B43_STAT_INITIALIZED) |
4872 | return; | 4872 | return; |
4873 | b43info(dev->wl, "Controller RESET (%s) ...\n", reason); | 4873 | b43info(dev->wl, "Controller RESET (%s) ...\n", reason); |
4874 | queue_work(dev->wl->hw->workqueue, &dev->restart_work); | 4874 | ieee80211_queue_work(dev->wl->hw, &dev->restart_work); |
4875 | } | 4875 | } |
4876 | 4876 | ||
4877 | #ifdef CONFIG_PM | 4877 | #ifdef CONFIG_PM |