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

wifi: cfg80211: move wowlan disable under locks 



This is a driver callback, and the driver should be able
to assume that it's called with the wiphy lock held. Move
the call up so that's true, it has no other effect since
the device is already unregistering and we cannot reach
this function through other paths.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 0dcb84ed

net/wireless/core.c

+4 −4
Original line number Diff line number Diff line
@@ -1065,6 +1065,10 @@ void wiphy_unregister(struct wiphy *wiphy) 
	cfg80211_rdev_list_generation++;

	device_del(&rdev->wiphy.dev);



#ifdef CONFIG_PM

	if (rdev->wiphy.wowlan_config && rdev->ops->set_wakeup)

		rdev_set_wakeup(rdev, false);

#endif

	wiphy_unlock(&rdev->wiphy);

	rtnl_unlock();
@@ -1080,10 +1084,6 @@ void wiphy_unregister(struct wiphy *wiphy) 
	flush_work(&rdev->mgmt_registrations_update_wk);

	flush_work(&rdev->background_cac_abort_wk);



#ifdef CONFIG_PM

	if (rdev->wiphy.wowlan_config && rdev->ops->set_wakeup)

		rdev_set_wakeup(rdev, false);

#endif

	cfg80211_rdev_free_wowlan(rdev);

	cfg80211_rdev_free_coalesce(rdev);

}