Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[~andy/linux] / net / wireless / core.c

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 9220021050624d681f0fa9b842b73d07ccebcff9..5ffff039b0174eefb8f3967dc6f5307ea7cb2f8c 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -367,7 +367,8 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
        rdev->wiphy.rts_threshold = (u32) -1;
        rdev->wiphy.coverage_class = 0;
 
-       rdev->wiphy.features = NL80211_FEATURE_SCAN_FLUSH;
+       rdev->wiphy.features = NL80211_FEATURE_SCAN_FLUSH |
+                              NL80211_FEATURE_ADVERTISE_CHAN_LIMITS;
 
        return &rdev->wiphy;
 }
@@ -874,8 +875,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                /* allow mac80211 to determine the timeout */
                wdev->ps_timeout = -1;
 
-               if (!dev->ethtool_ops)
-                       dev->ethtool_ops = &cfg80211_ethtool_ops;
+               netdev_set_default_ethtool_ops(dev, &cfg80211_ethtool_ops);
 
                if ((wdev->iftype == NL80211_IFTYPE_STATION ||
                     wdev->iftype == NL80211_IFTYPE_P2P_CLIENT ||