Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bfed683 authored by Amar Singhal's avatar Amar Singhal
Browse files

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



This reverts commit 2aa0bb3a. Upstream
commit aced43ce780dc5 ("cfg80211: Call reg_notifier for self managed
hints conditionally") replaces this functionality.

Change-Id: If52d83577ab2f136540f70ba17d417718ba05ddf
CRs-Fixed: 2201959
Signed-off-by: default avatarAmar Singhal <asinghal@codeaurora.org>
parent 7bb5a08d

net/wireless/reg.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

	}