diff options
| author | Amar Singhal <asinghal@codeaurora.org> | 2018-04-10 09:35:27 -0700 |
|---|---|---|
| committer | Amar Singhal <asinghal@codeaurora.org> | 2018-05-17 09:37:32 -0700 |
| commit | 7bb5a08db1cd3242a53bb9f1228784c911f7e6ee (patch) | |
| tree | 86d037a9dfcf9ef592fe518f9695829e7c537bc8 | |
| parent | 6e5dae3ae1af25ac48b005ccfb2cf7e033d312ce (diff) | |
Revert "reg: qcom: call regulatory callback for self managed hints"
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>
| -rw-r--r-- | net/wireless/reg.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 970880924eca..3cd0517399ff 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -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(®_requests_lock); - if (reg_only_self_managed_wiphys(reg_request)) { + if (reg_only_self_managed_wiphys()) { reg_free_request(reg_request); return; } |