summaryrefslogtreecommitdiff
path: root/net/wireless/core.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-03-04 14:24:02 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-03-04 14:24:02 -0500
commit5ba0eb4ad1d06f3d8f36dae02a0f2bf595d16ee4 (patch)
tree0d6d94bdf02f2c6c2a60c44fc3b1fabbda59de4d /net/wireless/core.c
parent466026989f112e0546ca39ab00a759af82dbe83a (diff)
parent801d929ca7d935ee199fd61d8ef914f51e892270 (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
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 33b75b9b8efa..922002105062 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;
}