aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/util.c
diff options
context:
space:
mode:
authorZhao, Gang <gamerh2o@gmail.com>2014-03-19 05:04:36 -0400
committerJohannes Berg <johannes.berg@intel.com>2014-03-19 16:29:58 -0400
commit73fb08e24ae840bc518facc2c605dd6bb3751fec (patch)
tree772b4e5a7e6f0f3049cace035723a93871438f01 /net/wireless/util.c
parent4da64622131b6b0cd1211e220dc88cc15007b59d (diff)
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>
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r--net/wireless/util.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c
index dadc934d987f..39fc1d70da69 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -838,7 +838,6 @@ void cfg80211_process_rdev_events(struct cfg80211_registered_device *rdev)
838 struct wireless_dev *wdev; 838 struct wireless_dev *wdev;
839 839
840 ASSERT_RTNL(); 840 ASSERT_RTNL();
841 ASSERT_RDEV_LOCK(rdev);
842 841
843 list_for_each_entry(wdev, &rdev->wdev_list, list) 842 list_for_each_entry(wdev, &rdev->wdev_list, list)
844 cfg80211_process_wdev_events(wdev); 843 cfg80211_process_wdev_events(wdev);
@@ -851,7 +850,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
851 int err; 850 int err;
852 enum nl80211_iftype otype = dev->ieee80211_ptr->iftype; 851 enum nl80211_iftype otype = dev->ieee80211_ptr->iftype;
853 852
854 ASSERT_RDEV_LOCK(rdev); 853 ASSERT_RTNL();
855 854
856 /* don't support changing VLANs, you just re-create them */ 855 /* don't support changing VLANs, you just re-create them */
857 if (otype == NL80211_IFTYPE_AP_VLAN) 856 if (otype == NL80211_IFTYPE_AP_VLAN)