summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2014-07-28 13:21:05 (GMT)
committerJohannes Berg <johannes.berg@intel.com>2014-08-26 09:16:01 (GMT)
commitf41ef64853fb1e02728e56b2d0d55aef8ed12b26 (patch)
tree600afe9f2a723366b7d3102343e232744eee6da2 /net/wireless
parentc70f59a2a007c57843195a93c3b7308204e0a5ab (diff)
downloadlinux-f41ef64853fb1e02728e56b2d0d55aef8ed12b26.tar.xz
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.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index afee5e0..a207eb1 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -492,12 +492,6 @@ int wiphy_register(struct wiphy *wiphy)
int i;
u16 ifmodes = wiphy->interface_modes;
- /*
- * There are major locking problems in nl80211/mac80211 for CSA,
- * disable for all drivers until this has been reworked.
- */
- wiphy->flags &= ~WIPHY_FLAG_HAS_CHANNEL_SWITCH;
-
#ifdef CONFIG_PM
if (WARN_ON(wiphy->wowlan &&
(wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&