diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-20 16:53:20 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-20 16:53:20 +0100 |
| commit | 7eb2450a51ea7606fa69ae4bb2113e0f228223cc (patch) | |
| tree | 6cd273487574edd2da40ce14b1981e14a5171caa /net/wireless/ap.c | |
| parent | mwifiex: update MCS set as per RX-STBC bit from hostapd (diff) | |
| parent | cfg80211: remove macro ASSERT_RDEV_LOCK(rdev) (diff) | |
| download | linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.xz linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/wireless/ap.c')
| -rw-r--r-- | net/wireless/ap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/wireless/ap.c b/net/wireless/ap.c index 68602be07cc1..3e02ade508d8 100644 --- a/net/wireless/ap.c +++ b/net/wireless/ap.c @@ -7,7 +7,7 @@ static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev, - struct net_device *dev) + struct net_device *dev, bool notify) { struct wireless_dev *wdev = dev->ieee80211_ptr; int err; @@ -30,20 +30,21 @@ static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev, memset(&wdev->chandef, 0, sizeof(wdev->chandef)); wdev->ssid_len = 0; rdev_set_qos_map(rdev, dev, NULL); - nl80211_send_ap_stopped(wdev); + if (notify) + nl80211_send_ap_stopped(wdev); } return err; } int cfg80211_stop_ap(struct cfg80211_registered_device *rdev, - struct net_device *dev) + struct net_device *dev, bool notify) { struct wireless_dev *wdev = dev->ieee80211_ptr; int err; wdev_lock(wdev); - err = __cfg80211_stop_ap(rdev, dev); + err = __cfg80211_stop_ap(rdev, dev, notify); wdev_unlock(wdev); return err; |