public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 08:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: cfg80211: fully move wiphy work to unbound workqueue

Browse source 
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: 91d20ab9d9 ("wifi: cfg80211: use system_unbound_wq for wiphy work")
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240522124126.7ca959f2cbd3.I3e2a71ef445d167b84000ccf934ea245aef8d395@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2024-05-22 12:41:25 +02:00
parent 4dc3a3893d
commit e296c95eac
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/wireless/core.c
View file

@ -431,7 +431,7 @@ static void cfg80211_wiphy_work(struct work_struct *work)
if (wk) { if (wk) {
list_del_init(&wk->entry); list_del_init(&wk->entry);
if (!list_empty(&rdev->wiphy_work_list)) if (!list_empty(&rdev->wiphy_work_list))
schedule_work(work); queue_work(system_unbound_wq, work);
spin_unlock_irq(&rdev->wiphy_work_lock); spin_unlock_irq(&rdev->wiphy_work_lock);
wk->func(&rdev->wiphy, wk); wk->func(&rdev->wiphy, wk);

4
net/wireless/sysfs.c
View file

@ -5,7 +5,7 @@
* *
* Copyright 2005-2006 Jiri Benc <jbenc@suse.cz> * Copyright 2005-2006 Jiri Benc <jbenc@suse.cz>
* Copyright 2006 Johannes Berg <johannes@sipsolutions.net> * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
* Copyright (C) 2020-2021, 2023 Intel Corporation * Copyright (C) 2020-2021, 2023-2024 Intel Corporation
*/ */
#include <linux/device.h> #include <linux/device.h>
@ -137,7 +137,7 @@ static int wiphy_resume(struct device *dev)
if (rdev->wiphy.registered && rdev->ops->resume) if (rdev->wiphy.registered && rdev->ops->resume)
ret = rdev_resume(rdev); ret = rdev_resume(rdev);
rdev->suspended = false; rdev->suspended = false;
schedule_work(&rdev->wiphy_work); queue_work(system_unbound_wq, &rdev->wiphy_work);
wiphy_unlock(&rdev->wiphy); wiphy_unlock(&rdev->wiphy);
if (ret) if (ret)