diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 09:31:39 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 09:31:39 -0400 |
| commit | 6fe5468f452c0c40348ebd4e737758a842286ca8 (patch) | |
| tree | befe5ab33c457a9e695b65be72600f383266e611 /net/wireless | |
| parent | deb09280cd72ceb8b0679490f076d0e9f30dd456 (diff) | |
| parent | 69a2bac8984c4e6dba78b330ed183fd580c65e99 (diff) | |
| download | linux-3.10-6fe5468f452c0c40348ebd4e737758a842286ca8.tar.gz linux-3.10-6fe5468f452c0c40348ebd4e737758a842286ca8.tar.bz2 linux-3.10-6fe5468f452c0c40348ebd4e737758a842286ca8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
Diffstat (limited to 'net/wireless')
| -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 818ad637819..a9dc5c736df 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -228,6 +228,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); @@ -252,6 +253,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(); |