Merge tag 'timers-core-2021-02-15' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / net / wireless / util.c

diff --git a/net/wireless/util.c b/net/wireless/util.c
index eab9280..1bf0200 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -997,7 +997,7 @@ void cfg80211_process_rdev_events(struct cfg80211_registered_device *rdev)
 {
        struct wireless_dev *wdev;
 
-       ASSERT_RTNL();
+       lockdep_assert_held(&rdev->wiphy.mtx);
 
        list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list)
                cfg80211_process_wdev_events(wdev);
@@ -1010,7 +1010,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
        int err;
        enum nl80211_iftype otype = dev->ieee80211_ptr->iftype;
 
-       ASSERT_RTNL();
+       lockdep_assert_held(&rdev->wiphy.mtx);
 
        /* don't support changing VLANs, you just re-create them */
        if (otype == NL80211_IFTYPE_AP_VLAN)