Skip to content

Commit e296c95

Browse files
committed
wifi: cfg80211: fully move wiphy work to unbound workqueue
Previously I had moved the wiphy work to the unbound system workqueue, but missed that when it restarts and during resume it was still using the normal system workqueue. Fix that. Fixes: 91d20ab ("wifi: cfg80211: use system_unbound_wq for wiphy work") Reviewed-by: Miriam Rachel Korenblit <[email protected]> Link: https://msgid.link/20240522124126.7ca959f2cbd3.I3e2a71ef445d167b84000ccf934ea245aef8d395@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent 4dc3a38 commit e296c95

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

net/wireless/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ static void cfg80211_wiphy_work(struct work_struct *work)
431431
if (wk) {
432432
list_del_init(&wk->entry);
433433
if (!list_empty(&rdev->wiphy_work_list))
434-
schedule_work(work);
434+
queue_work(system_unbound_wq, work);
435435
spin_unlock_irq(&rdev->wiphy_work_lock);
436436

437437
wk->func(&rdev->wiphy, wk);

net/wireless/sysfs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Copyright 2005-2006 Jiri Benc <[email protected]>
77
* Copyright 2006 Johannes Berg <[email protected]>
8-
* Copyright (C) 2020-2021, 2023 Intel Corporation
8+
* Copyright (C) 2020-2021, 2023-2024 Intel Corporation
99
*/
1010

1111
#include <linux/device.h>
@@ -137,7 +137,7 @@ static int wiphy_resume(struct device *dev)
137137
if (rdev->wiphy.registered && rdev->ops->resume)
138138
ret = rdev_resume(rdev);
139139
rdev->suspended = false;
140-
schedule_work(&rdev->wiphy_work);
140+
queue_work(system_unbound_wq, &rdev->wiphy_work);
141141
wiphy_unlock(&rdev->wiphy);
142142

143143
if (ret)

0 commit comments

Comments
 (0)