diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-03 20:19:48 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-03 20:19:48 +0200 |
| commit | 9306a398e76df1952685e95cc293c4100fe5286d (patch) | |
| tree | 05d34e5ccbb06ae0824607aa39834d9f58096b5b /net | |
| parent | mwifiex: limit channel number not to overflow memory (diff) | |
| parent | cfg80211: sched_scan_mtx lock in cfg80211_conn_work() (diff) | |
| download | linux-9306a398e76df1952685e95cc293c4100fe5286d.tar.xz linux-9306a398e76df1952685e95cc293c4100fe5286d.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/sme.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 09d994d192ff..482c70e70127 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -224,6 +224,7 @@ void cfg80211_conn_work(struct work_struct *work) rtnl_lock(); cfg80211_lock_rdev(rdev); mutex_lock(&rdev->devlist_mtx); + mutex_lock(&rdev->sched_scan_mtx); list_for_each_entry(wdev, &rdev->wdev_list, list) { wdev_lock(wdev); @@ -248,6 +249,7 @@ void cfg80211_conn_work(struct work_struct *work) wdev_unlock(wdev); } + mutex_unlock(&rdev->sched_scan_mtx); mutex_unlock(&rdev->devlist_mtx); cfg80211_unlock_rdev(rdev); rtnl_unlock(); |