aboutsummaryrefslogtreecommitdiff
path: root/net/wireless/util.c
diff options
context:
space:
mode:
authorZhao, Gang <gamerh2o@gmail.com>2014-03-19 17:04:36 +0800
committerJohannes Berg <johannes.berg@intel.com>2014-03-19 21:29:58 +0100
commit73fb08e24ae840bc518facc2c605dd6bb3751fec (patch)
tree772b4e5a7e6f0f3049cace035723a93871438f01 /net/wireless/util.c
parent4da64622131b6b0cd1211e220dc88cc15007b59d (diff)
downloadlinux-stericsson-73fb08e24ae840bc518facc2c605dd6bb3751fec.tar.gz
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)
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)