summaryrefslogtreecommitdiffstats
path: root/net/wireless/core.c
diff options
context:
space:
mode:
authorJohn W. Linville2013-03-06 16:21:17 +0100
committerJohn W. Linville2013-03-06 16:21:17 +0100
commit32cdd592b723fc88ecca699e550197cd48bb4ad6 (patch)
treef6e45b4630abb47fa352b53fdc546aec27eb5cda /net/wireless/core.c
parentbenet: Wait f/w POST until timeout (diff)
parentMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff)
downloadkernel-qcow2-linux-32cdd592b723fc88ecca699e550197cd48bb4ad6.tar.gz
kernel-qcow2-linux-32cdd592b723fc88ecca699e550197cd48bb4ad6.tar.xz
kernel-qcow2-linux-32cdd592b723fc88ecca699e550197cd48bb4ad6.zip
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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 5ffff039b017..ea4155fe9733 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;
}