Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 3893409dee95b3ba23c39b369a57c48c6e838d9b..b0915515640efed1ff4795103c0572aba48c38f4 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -419,6 +419,7 @@ use_default_name:
        device_initialize(&rdev->wiphy.dev);
        rdev->wiphy.dev.class = &ieee80211_class;
        rdev->wiphy.dev.platform_data = rdev;
+       device_enable_async_suspend(&rdev->wiphy.dev);
 
        INIT_LIST_HEAD(&rdev->destroy_list);
        spin_lock_init(&rdev->destroy_list_lock);
@@ -460,6 +461,9 @@ use_default_name:
 
        rdev->wiphy.max_num_csa_counters = 1;
 
+       rdev->wiphy.max_sched_scan_plans = 1;
+       rdev->wiphy.max_sched_scan_plan_interval = U32_MAX;
+
        return &rdev->wiphy;
 }
 EXPORT_SYMBOL(wiphy_new_nm);
@@ -635,7 +639,7 @@ int wiphy_register(struct wiphy *wiphy)
                if (WARN_ON(!sband->n_channels))
                        return -EINVAL;
                /*
-                * on 60gHz band, there are no legacy rates, so
+                * on 60GHz band, there are no legacy rates, so
                 * n_bitrates is 0
                 */
                if (WARN_ON(band != IEEE80211_BAND_60GHZ &&