Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9306a398 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents 901ceba4 90e0970f

net/wireless/sme.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -224,6 +224,7 @@ void cfg80211_conn_work(struct work_struct *work) 
	rtnl_lock();

	rtnl_lock();

	cfg80211_lock_rdev(rdev);

	cfg80211_lock_rdev(rdev);

	mutex_lock(&rdev->devlist_mtx);

	mutex_lock(&rdev->devlist_mtx);

	mutex_lock(&rdev->sched_scan_mtx);





	list_for_each_entry(wdev, &rdev->wdev_list, list) {

	list_for_each_entry(wdev, &rdev->wdev_list, list) {

		wdev_lock(wdev);

		wdev_lock(wdev);
@@ -248,6 +249,7 @@ void cfg80211_conn_work(struct work_struct *work) 
		wdev_unlock(wdev);

		wdev_unlock(wdev);

	}

	}





	mutex_unlock(&rdev->sched_scan_mtx);

	mutex_unlock(&rdev->devlist_mtx);

	mutex_unlock(&rdev->devlist_mtx);

	cfg80211_unlock_rdev(rdev);

	cfg80211_unlock_rdev(rdev);

	rtnl_unlock();

	rtnl_unlock();