diff options
author | Alban Browaeys <prahal@yahoo.com> | 2009-11-25 09:13:00 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-28 15:05:00 -0500 |
commit | e60d7443e00a72a2c056950cdaab79c7b077f3d4 (patch) | |
tree | 0d2376434a0f44ac2b30bba0af3cdcb8e5421c90 /net/wireless/core.c | |
parent | ece1e3c61e59ba184150e5aff57bbc6355613e3e (diff) |
wireless : use a dedicated workqueue for cfg80211.
This patch moves the works cleanup, scan and events to a cfg80211
dedicated workqueue.
Platform driver like eeepc-laptop ought to use works to rfkill (as
new rfkill does lock in rfkill_unregister and the platform driver is
called from rfkill_switch_all which also lock the same mutex).
This raise a new issue in itself that the work scheduled by the platform
driver to the global worqueue calls wiphy_unregister which flush_work
scan and event works (which thus flush works on the global workqueue inside
a work on the global workqueue) and also put on hold the wdev_cleanup_work
(which prevents the dev_put on netdev thus indefinite Usage count error on
wifi device).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Alban Browaeys <prahal@yahoo.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r-- | net/wireless/core.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index fe6f402a22af..c2a2c563d21a 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
@@ -45,6 +45,9 @@ DEFINE_MUTEX(cfg80211_mutex); | |||
45 | /* for debugfs */ | 45 | /* for debugfs */ |
46 | static struct dentry *ieee80211_debugfs_dir; | 46 | static struct dentry *ieee80211_debugfs_dir; |
47 | 47 | ||
48 | /* for the cleanup, scan and event works */ | ||
49 | struct workqueue_struct *cfg80211_wq; | ||
50 | |||
48 | /* requires cfg80211_mutex to be held! */ | 51 | /* requires cfg80211_mutex to be held! */ |
49 | struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx) | 52 | struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx) |
50 | { | 53 | { |
@@ -727,7 +730,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, | |||
727 | break; | 730 | break; |
728 | case NETDEV_DOWN: | 731 | case NETDEV_DOWN: |
729 | dev_hold(dev); | 732 | dev_hold(dev); |
730 | schedule_work(&wdev->cleanup_work); | 733 | queue_work(cfg80211_wq, &wdev->cleanup_work); |
731 | break; | 734 | break; |
732 | case NETDEV_UP: | 735 | case NETDEV_UP: |
733 | /* | 736 | /* |
@@ -845,8 +848,14 @@ static int __init cfg80211_init(void) | |||
845 | if (err) | 848 | if (err) |
846 | goto out_fail_reg; | 849 | goto out_fail_reg; |
847 | 850 | ||
851 | cfg80211_wq = create_singlethread_workqueue("cfg80211"); | ||
852 | if (!cfg80211_wq) | ||
853 | goto out_fail_wq; | ||
854 | |||
848 | return 0; | 855 | return 0; |
849 | 856 | ||
857 | out_fail_wq: | ||
858 | regulatory_exit(); | ||
850 | out_fail_reg: | 859 | out_fail_reg: |
851 | debugfs_remove(ieee80211_debugfs_dir); | 860 | debugfs_remove(ieee80211_debugfs_dir); |
852 | out_fail_nl80211: | 861 | out_fail_nl80211: |
@@ -868,5 +877,6 @@ static void cfg80211_exit(void) | |||
868 | wiphy_sysfs_exit(); | 877 | wiphy_sysfs_exit(); |
869 | regulatory_exit(); | 878 | regulatory_exit(); |
870 | unregister_pernet_device(&cfg80211_pernet_ops); | 879 | unregister_pernet_device(&cfg80211_pernet_ops); |
880 | destroy_workqueue(cfg80211_wq); | ||
871 | } | 881 | } |
872 | module_exit(cfg80211_exit); | 882 | module_exit(cfg80211_exit); |