diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-06 10:21:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-06 10:21:17 -0500 |
| commit | 32cdd592b723fc88ecca699e550197cd48bb4ad6 (patch) | |
| tree | f6e45b4630abb47fa352b53fdc546aec27eb5cda /net/wireless/core.c | |
| parent | 66d29cbc59433ba538922a9e958495156b31b83b (diff) | |
| parent | 4f21e7e4414c91cc9a3e37b93574aa98db66894d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 5ffff039b01..ea4155fe973 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -367,8 +367,7 @@ 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 | - NL80211_FEATURE_ADVERTISE_CHAN_LIMITS; + rdev->wiphy.features = NL80211_FEATURE_SCAN_FLUSH; return &rdev->wiphy; } |