Merge tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / wireless / ap.c

diff --git a/net/wireless/ap.c b/net/wireless/ap.c
index 11ee4ed04f73ea2ae0dd1ae6293837785d8fd5f8..3e02ade508d8804d4158a03ad5de474d64bf7594 100644 (file)
--- 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;
@@ -27,22 +27,24 @@ static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
        err = rdev_stop_ap(rdev, dev);
        if (!err) {
                wdev->beacon_interval = 0;
-               wdev->channel = NULL;
+               memset(&wdev->chandef, 0, sizeof(wdev->chandef));
                wdev->ssid_len = 0;
                rdev_set_qos_map(rdev, dev, NULL);
+               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;