cfg80211: re-enable CSA for drivers that support it
authorMichal Kazior <michal.kazior@tieto.com>
Mon, 28 Jul 2014 13:21:05 +0000 (15:21 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 26 Aug 2014 09:16:01 +0000 (11:16 +0200)
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>
net/wireless/core.c

index afee5e0455ea460b9b3d2e39c27e7eb0d881fa9f..a207eb116829b47c3dc3c122eb12092b6b906f1e 100644 (file)
@@ -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) &&