cfg80211: remove macro ASSERT_RDEV_LOCK(rdev)

Macro ASSERT_RDEV_LOCK(rdev) is equal to ASSERT_RTNL(), so replace it
with ASSERT_RTNL() and remove it.

Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/core.h b/net/wireless/core.h
index 579149d0ea34f42f2a865ab705c355cc9c2ce085..5b1fdcadd46985548f4a04f4f64ddaccbc935661 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -166,7 +166,6 @@ static inline void wdev_unlock(struct wireless_dev *wdev)
        mutex_unlock(&wdev->mtx);
 }
 
-#define ASSERT_RDEV_LOCK(rdev) ASSERT_RTNL()
 #define ASSERT_WDEV_LOCK(wdev) lockdep_assert_held(&(wdev)->mtx)
 
 static inline bool cfg80211_has_monitors_only(struct cfg80211_registered_device *rdev)

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index f04d4c32e96e144d37b49de5d1be69add8a55b2c..acdcb4a81817b7c78e8e721ff632284b9b806fa9 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -64,7 +64,6 @@ static int cfg80211_conn_scan(struct wireless_dev *wdev)
        int n_channels, err;
 
        ASSERT_RTNL();
-       ASSERT_RDEV_LOCK(rdev);
        ASSERT_WDEV_LOCK(wdev);
 
        if (rdev->scan_req || rdev->scan_msg)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index dadc934d987f90ba8022d85ea847e8dca9b502f8..39fc1d70da6980a1e9457884e96ee3da582ce259 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -838,7 +838,6 @@ void cfg80211_process_rdev_events(struct cfg80211_registered_device *rdev)
        struct wireless_dev *wdev;
 
        ASSERT_RTNL();
-       ASSERT_RDEV_LOCK(rdev);
 
        list_for_each_entry(wdev, &rdev->wdev_list, list)
                cfg80211_process_wdev_events(wdev);
@@ -851,7 +850,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
        int err;
        enum nl80211_iftype otype = dev->ieee80211_ptr->iftype;
 
-       ASSERT_RDEV_LOCK(rdev);
+       ASSERT_RTNL();
 
        /* don't support changing VLANs, you just re-create them */
        if (otype == NL80211_IFTYPE_AP_VLAN)

diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index 14c9a2583ba0926a2e14a777aaa5b69fd09f8963..86c331a65664a77bfe6c083224b7eae2c91f5b9c 100644 (file)
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -21,7 +21,7 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
        const u8 *prev_bssid = NULL;
        int err, i;
 
-       ASSERT_RDEV_LOCK(rdev);
+       ASSERT_RTNL();
        ASSERT_WDEV_LOCK(wdev);
 
        if (!netif_running(wdev->netdev))