diff options
author | Johannes Berg <johannes.berg@intel.com> | 2014-01-23 10:32:29 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-06 03:55:18 -0500 |
commit | 5a6aa705ffdd97552ff756bbfa7d5a3b62a6c690 (patch) | |
tree | 69a703c4bfc01a79ac0b94d611b696463fd49198 /net | |
parent | f12cb2893069495726c21a4b0178705dacfecfe0 (diff) |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/core.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index d89dee2259b5..77fe4c791269 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
@@ -440,9 +440,6 @@ int wiphy_register(struct wiphy *wiphy) | |||
440 | int i; | 440 | int i; |
441 | u16 ifmodes = wiphy->interface_modes; | 441 | u16 ifmodes = wiphy->interface_modes; |
442 | 442 | ||
443 | /* support for 5/10 MHz is broken due to nl80211 API mess - disable */ | ||
444 | wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ; | ||
445 | |||
446 | /* | 443 | /* |
447 | * There are major locking problems in nl80211/mac80211 for CSA, | 444 | * There are major locking problems in nl80211/mac80211 for CSA, |
448 | * disable for all drivers until this has been reworked. | 445 | * disable for all drivers until this has been reworked. |