Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / net / wireless / scan.c

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index ae0c2256ba3beef62c9bc3492d788fdd90882da2..2936cb809152cd77451147c22045924396026bbc 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -132,18 +132,17 @@ EXPORT_SYMBOL(cfg80211_sched_scan_stopped);
 int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
                               bool driver_initiated)
 {
-       int err;
        struct net_device *dev;
 
        lockdep_assert_held(&rdev->sched_scan_mtx);
 
        if (!rdev->sched_scan_req)
-               return 0;
+               return -ENOENT;
 
        dev = rdev->sched_scan_req->dev;
 
        if (!driver_initiated) {
-               err = rdev->ops->sched_scan_stop(&rdev->wiphy, dev);
+               int err = rdev->ops->sched_scan_stop(&rdev->wiphy, dev);
                if (err)
                        return err;
        }
@@ -153,7 +152,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
        kfree(rdev->sched_scan_req);
        rdev->sched_scan_req = NULL;
 
-       return err;
+       return 0;
 }
 
 static void bss_release(struct kref *ref)
@@ -863,6 +862,10 @@ int cfg80211_wext_siwscan(struct net_device *dev,
                        creq->n_ssids = 0;
        }
 
+       for (i = 0; i < IEEE80211_NUM_BANDS; i++)
+               if (wiphy->bands[i])
+                       creq->rates[i] = (1 << wiphy->bands[i]->n_bitrates) - 1;
+
        rdev->scan_req = creq;
        err = rdev->ops->scan(wiphy, dev, creq);
        if (err) {