diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-03-20 15:53:20 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-20 15:53:20 (GMT) |
commit | 7eb2450a51ea7606fa69ae4bb2113e0f228223cc (patch) | |
tree | 6cd273487574edd2da40ce14b1981e14a5171caa /net/wireless/util.c | |
parent | 474a41e94dfc85167e1761bfbb8bf180f90633b2 (diff) | |
parent | 73fb08e24ae840bc518facc2c605dd6bb3751fec (diff) | |
download | linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.xz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r-- | net/wireless/util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 57b3ce7..39fc1d7 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) @@ -886,7 +885,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev, switch (otype) { case NL80211_IFTYPE_AP: - cfg80211_stop_ap(rdev, dev); + cfg80211_stop_ap(rdev, dev, true); break; case NL80211_IFTYPE_ADHOC: cfg80211_leave_ibss(rdev, dev, false); |