aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/core.c6
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) &&