summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-01-23 15:32:29 (GMT)
committerJohannes Berg <johannes.berg@intel.com>2014-02-06 08:55:18 (GMT)
commit5a6aa705ffdd97552ff756bbfa7d5a3b62a6c690 (patch)
tree69a703c4bfc01a79ac0b94d611b696463fd49198
parentf12cb2893069495726c21a4b0178705dacfecfe0 (diff)
downloadlinux-5a6aa705ffdd97552ff756bbfa7d5a3b62a6c690.tar.xz
cfg80211: re-enable 5/10 MHz support
Unfortunately I forgot this during the merge window, but the patch seems small enough to go in as a fix. The userspace API bug that was the reason for disabling it has long been fixed. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/wireless/core.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index d89dee2..77fe4c7 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -440,9 +440,6 @@ int wiphy_register(struct wiphy *wiphy)
int i;
u16 ifmodes = wiphy->interface_modes;
- /* support for 5/10 MHz is broken due to nl80211 API mess - disable */
- wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ;
-
/*
* There are major locking problems in nl80211/mac80211 for CSA,
* disable for all drivers until this has been reworked.