aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-04-08 14:26:57 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-04-08 14:26:57 -0400
commit64e5751918b4d03015b185750a46ecd050e1ce77 (patch)
tree59faf25665e51414479b138a3c2e3bc8b388a9ed /net
parentb50b72de2f2feed4adfbd8e18610a393b5a04cc7 (diff)
parent69a2bac8984c4e6dba78b330ed183fd580c65e99 (diff)
downloadvexpress-lsk-64e5751918b4d03015b185750a46ecd050e1ce77.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net')
-rw-r--r--net/wireless/sme.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 09d994d192f..482c70e7012 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();