Merge "Revert "reg: qcom: call reg notifier during wiphy registration""

1 files changed, 7 insertions, 11 deletions

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 970880924eca..4ede2c4cff41 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1760,13 +1760,11 @@ static void wiphy_update_regulatory(struct wiphy *wiphy,
 	if (ignore_reg_update(wiphy, initiator)) {
 		/*
 		 * Regulatory updates set by CORE are ignored for custom
-		 * regulatory cards and for self managed regulatory.
-		 * Let us notify the changes to the driver,
+		 * regulatory cards. Let us notify the changes to the driver,
 		 * as some drivers used this to restore its orig_* reg domain.
 		 */
-		if ((initiator == NL80211_REGDOM_SET_BY_CORE &&
-		     wiphy->regulatory_flags & REGULATORY_CUSTOM_REG) ||
-		    (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED))
+		if (initiator == NL80211_REGDOM_SET_BY_CORE &&
+		    wiphy->regulatory_flags & REGULATORY_CUSTOM_REG)
 			reg_call_notifier(wiphy, lr);
 		return;
 	}
@@ -2257,7 +2255,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 +2265,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 +2306,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;
 	}