diff options
author | Michal Kazior <michal.kazior@tieto.com> | 2014-07-28 09:21:05 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-08-26 05:16:01 -0400 |
commit | f41ef64853fb1e02728e56b2d0d55aef8ed12b26 (patch) | |
tree | 600afe9f2a723366b7d3102343e232744eee6da2 /net/wireless | |
parent | c70f59a2a007c57843195a93c3b7308204e0a5ab (diff) |
cfg80211: re-enable CSA for drivers that support it
This reverts commit dda444d52496aa8ddc501561bca580f1374a96a9.
Channel switching code has been reworked and
improved significantly since the time original
locking issues were found.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/core.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index afee5e0455ea..a207eb116829 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
@@ -492,12 +492,6 @@ int wiphy_register(struct wiphy *wiphy) | |||
492 | int i; | 492 | int i; |
493 | u16 ifmodes = wiphy->interface_modes; | 493 | u16 ifmodes = wiphy->interface_modes; |
494 | 494 | ||
495 | /* | ||
496 | * There are major locking problems in nl80211/mac80211 for CSA, | ||
497 | * disable for all drivers until this has been reworked. | ||
498 | */ | ||
499 | wiphy->flags &= ~WIPHY_FLAG_HAS_CHANNEL_SWITCH; | ||
500 | |||
501 | #ifdef CONFIG_PM | 495 | #ifdef CONFIG_PM |
502 | if (WARN_ON(wiphy->wowlan && | 496 | if (WARN_ON(wiphy->wowlan && |
503 | (wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) && | 497 | (wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) && |