OSDN Git Service

Revert "reg: qcom: call regulatory callback for self managed hints"
authorAmar Singhal <asinghal@codeaurora.org>
Tue, 10 Apr 2018 16:35:27 +0000 (09:35 -0700)
committerAmar Singhal <asinghal@codeaurora.org>
Thu, 17 May 2018 16:37:32 +0000 (09:37 -0700)
This reverts commit 31e37a680dcbb02ba41d17972dba0b298cf1983d. Upstream
commit aced43ce780d ("cfg80211: Call reg_notifier for self managed
hints conditionally") replaces this functionality.

Change-Id: Ic0c3a235aee2dc8ccb36014c60314217b98b5b97
CRs-Fixed: 2201959
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
net/wireless/reg.c

index 9708809..3cd0517 100644 (file)
@@ -2257,7 +2257,7 @@ out_free:
        reg_free_request(reg_request);
 }
 
-static bool reg_only_self_managed_wiphys(struct regulatory_request *reg_request)
+static bool reg_only_self_managed_wiphys(void)
 {
        struct cfg80211_registered_device *rdev;
        struct wiphy *wiphy;
@@ -2267,12 +2267,10 @@ static bool reg_only_self_managed_wiphys(struct regulatory_request *reg_request)
 
        list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
                wiphy = &rdev->wiphy;
-               if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) {
+               if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED)
                        self_managed_found = true;
-                       reg_call_notifier(wiphy, reg_request);
-               } else {
+               else
                        return false;
-               }
        }
 
        /* make sure at least one self-managed wiphy exists */
@@ -2310,7 +2308,7 @@ static void reg_process_pending_hints(void)
 
        spin_unlock(&reg_requests_lock);
 
-       if (reg_only_self_managed_wiphys(reg_request)) {
+       if (reg_only_self_managed_wiphys()) {
                reg_free_request(reg_request);
                return;
        }