Commit f7e60032 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: cfg80211: fix locking in regulatory disconnect 



This should use wiphy_lock() now instead of requiring the
RTNL, since __cfg80211_leave() via cfg80211_leave() is now
requiring that lock to be held.

Fixes: a05829a7 ("cfg80211: avoid holding the RTNL when calling the driver")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3e54ed82

net/wireless/reg.c

+2 −2
Original line number Diff line number Diff line
@@ -2440,11 +2440,11 @@ static void reg_leave_invalid_chans(struct wiphy *wiphy) 
	struct wireless_dev *wdev;

	struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);



	ASSERT_RTNL();



	wiphy_lock(wiphy);

	list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list)

		if (!reg_wdev_chan_valid(wiphy, wdev))

			cfg80211_leave(rdev, wdev);

	wiphy_unlock(wiphy);

}



static void reg_check_chans_work(struct work_struct *work)