RISCV: configs: Enable temperature sensor defconfig

[platform/kernel/linux-starfive.git] / net / wireless / core.c

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 5b0c4d5..609b79f 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -368,12 +368,12 @@ static void cfg80211_sched_scan_stop_wk(struct work_struct *work)
        rdev = container_of(work, struct cfg80211_registered_device,
                           sched_scan_stop_wk);
 
-       rtnl_lock();
+       wiphy_lock(&rdev->wiphy);
        list_for_each_entry_safe(req, tmp, &rdev->sched_scan_req_list, list) {
                if (req->nl_owner_dead)
                        cfg80211_stop_sched_scan_req(rdev, req, false);
        }
-       rtnl_unlock();
+       wiphy_unlock(&rdev->wiphy);
 }
 
 static void cfg80211_propagate_radar_detect_wk(struct work_struct *work)
@@ -721,22 +721,6 @@ int wiphy_register(struct wiphy *wiphy)
                        return -EINVAL;
        }
 
-       /*
-        * if a wiphy has unsupported modes for regulatory channel enforcement,
-        * opt-out of enforcement checking
-        */
-       if (wiphy->interface_modes & ~(BIT(NL80211_IFTYPE_STATION) |
-                                      BIT(NL80211_IFTYPE_P2P_CLIENT) |
-                                      BIT(NL80211_IFTYPE_AP) |
-                                      BIT(NL80211_IFTYPE_MESH_POINT) |
-                                      BIT(NL80211_IFTYPE_P2P_GO) |
-                                      BIT(NL80211_IFTYPE_ADHOC) |
-                                      BIT(NL80211_IFTYPE_P2P_DEVICE) |
-                                      BIT(NL80211_IFTYPE_NAN) |
-                                      BIT(NL80211_IFTYPE_AP_VLAN) |
-                                      BIT(NL80211_IFTYPE_MONITOR)))
-               wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF;
-
        if (WARN_ON((wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) &&
                    (wiphy->regulatory_flags &
                                        (REGULATORY_CUSTOM_REG |