1 files changed, 3 insertions, 10 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index afee5e0455ea..c6620aa679e0 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) &&
@@ -635,6 +629,9 @@ int wiphy_register(struct wiphy *wiphy)
         if (IS_ERR(rdev->wiphy.debugfsdir))
                 rdev->wiphy.debugfsdir = NULL;
 
+        cfg80211_debugfs_rdev_add(rdev);
+        nl80211_notify_wiphy(rdev, NL80211_CMD_NEW_WIPHY);
+
         if (wiphy->regulatory_flags & REGULATORY_CUSTOM_REG) {
                 struct regulatory_request request;
 
@@ -646,8 +643,6 @@ int wiphy_register(struct wiphy *wiphy)
                 nl80211_send_reg_change_event(&request);
         }
 
-        cfg80211_debugfs_rdev_add(rdev);
-
         rdev->wiphy.registered = true;
         rtnl_unlock();
 
@@ -659,8 +654,6 @@ int wiphy_register(struct wiphy *wiphy)
                 return res;
         }
 
-        nl80211_notify_wiphy(rdev, NL80211_CMD_NEW_WIPHY);
-
         return 0;
 }
 EXPORT_SYMBOL(wiphy_register);