adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

wireless : use a dedicated workqueue for cfg80211.

Browse source 
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>
This commit is contained in:
Alban Browaeys 2009-11-25 15:13:00 +01:00 committed by John W. Linville
parent ece1e3c61e
commit e60d7443e0
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/wireless/core.c
View file

@ -45,6 +45,9 @@ DEFINE_MUTEX(cfg80211_mutex);
/* for debugfs */ /* for debugfs */
static struct dentry *ieee80211_debugfs_dir; static struct dentry *ieee80211_debugfs_dir;
/* for the cleanup, scan and event works */
struct workqueue_struct *cfg80211_wq;
/* requires cfg80211_mutex to be held! */ /* requires cfg80211_mutex to be held! */
struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx) struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx)
{ {
@ -727,7 +730,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
break; break;
case NETDEV_DOWN: case NETDEV_DOWN:
dev_hold(dev); dev_hold(dev);
schedule_work(&wdev->cleanup_work); queue_work(cfg80211_wq, &wdev->cleanup_work);
break; break;
case NETDEV_UP: case NETDEV_UP:
/* /*
@ -845,8 +848,14 @@ static int __init cfg80211_init(void)
if (err) if (err)
goto out_fail_reg; goto out_fail_reg;
cfg80211_wq = create_singlethread_workqueue("cfg80211");
if (!cfg80211_wq)
goto out_fail_wq;
return 0; return 0;
out_fail_wq:
regulatory_exit();
out_fail_reg: out_fail_reg:
debugfs_remove(ieee80211_debugfs_dir); debugfs_remove(ieee80211_debugfs_dir);
out_fail_nl80211: out_fail_nl80211:
@ -868,5 +877,6 @@ static void cfg80211_exit(void)
wiphy_sysfs_exit(); wiphy_sysfs_exit();
regulatory_exit(); regulatory_exit();
unregister_pernet_device(&cfg80211_pernet_ops); unregister_pernet_device(&cfg80211_pernet_ops);
destroy_workqueue(cfg80211_wq);
} }
module_exit(cfg80211_exit); module_exit(cfg80211_exit);

2
net/wireless/core.h
View file

@ -91,6 +91,8 @@ bool wiphy_idx_valid(int wiphy_idx)
return (wiphy_idx >= 0); return (wiphy_idx >= 0);
} }
extern struct workqueue_struct *cfg80211_wq;
extern struct mutex cfg80211_mutex; extern struct mutex cfg80211_mutex;
extern struct list_head cfg80211_rdev_list; extern struct list_head cfg80211_rdev_list;
extern int cfg80211_rdev_list_generation; extern int cfg80211_rdev_list_generation;

2
net/wireless/ibss.c
View file

@ -70,7 +70,7 @@ void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, gfp_t gfp)
spin_lock_irqsave(&wdev->event_lock, flags); spin_lock_irqsave(&wdev->event_lock, flags);
list_add_tail(&ev->list, &wdev->event_list); list_add_tail(&ev->list, &wdev->event_list);
spin_unlock_irqrestore(&wdev->event_lock, flags); spin_unlock_irqrestore(&wdev->event_lock, flags);
schedule_work(&rdev->event_work); queue_work(cfg80211_wq, &rdev->event_work);
} }
EXPORT_SYMBOL(cfg80211_ibss_joined); EXPORT_SYMBOL(cfg80211_ibss_joined);

2
net/wireless/scan.c
View file

@ -88,7 +88,7 @@ void cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted)
WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req);
request->aborted = aborted; request->aborted = aborted;
schedule_work(&wiphy_to_dev(request->wiphy)->scan_done_wk); queue_work(cfg80211_wq, &wiphy_to_dev(request->wiphy)->scan_done_wk);
} }
EXPORT_SYMBOL(cfg80211_scan_done); EXPORT_SYMBOL(cfg80211_scan_done);

6
net/wireless/sme.c
View file

@ -488,7 +488,7 @@ void cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
spin_lock_irqsave(&wdev->event_lock, flags); spin_lock_irqsave(&wdev->event_lock, flags);
list_add_tail(&ev->list, &wdev->event_list); list_add_tail(&ev->list, &wdev->event_list);
spin_unlock_irqrestore(&wdev->event_lock, flags); spin_unlock_irqrestore(&wdev->event_lock, flags);
schedule_work(&rdev->event_work); queue_work(cfg80211_wq, &rdev->event_work);
} }
EXPORT_SYMBOL(cfg80211_connect_result); EXPORT_SYMBOL(cfg80211_connect_result);
@ -583,7 +583,7 @@ void cfg80211_roamed(struct net_device *dev, const u8 *bssid,
spin_lock_irqsave(&wdev->event_lock, flags); spin_lock_irqsave(&wdev->event_lock, flags);
list_add_tail(&ev->list, &wdev->event_list); list_add_tail(&ev->list, &wdev->event_list);
spin_unlock_irqrestore(&wdev->event_lock, flags); spin_unlock_irqrestore(&wdev->event_lock, flags);
schedule_work(&rdev->event_work); queue_work(cfg80211_wq, &rdev->event_work);
} }
EXPORT_SYMBOL(cfg80211_roamed); EXPORT_SYMBOL(cfg80211_roamed);
@ -681,7 +681,7 @@ void cfg80211_disconnected(struct net_device *dev, u16 reason,
spin_lock_irqsave(&wdev->event_lock, flags); spin_lock_irqsave(&wdev->event_lock, flags);
list_add_tail(&ev->list, &wdev->event_list); list_add_tail(&ev->list, &wdev->event_list);
spin_unlock_irqrestore(&wdev->event_lock, flags); spin_unlock_irqrestore(&wdev->event_lock, flags);
schedule_work(&rdev->event_work); queue_work(cfg80211_wq, &rdev->event_work);
} }
EXPORT_SYMBOL(cfg80211_disconnected); EXPORT_SYMBOL(cfg80211_disconnected);