Merge "cfg80211: unblock user hint when cfg80211_regdom is intersected" (543b9e74) · Commits · e / devices / android_kernel_oneplus_sm7250

net/wireless/reg.c

+13 −3

Original line number	Original line	Diff line number	Diff line
	@@ -421,6 +421,11 @@ static bool is_user_regdom_saved(void)
	return true;		return true;
	}		}

			static bool is_cfg80211_regdom_intersected(void)
			{
			return is_intersected_alpha2(get_cfg80211_regdom()->alpha2);
			}

	static const struct ieee80211_regdomain *		static const struct ieee80211_regdomain *
	reg_copy_regd(const struct ieee80211_regdomain *src_regd)		reg_copy_regd(const struct ieee80211_regdomain *src_regd)
	{		{
	@@ -2366,9 +2371,14 @@ __reg_process_hint_user(struct regulatory_request *user_request)
	*/		*/
	if ((lr->initiator == NL80211_REGDOM_SET_BY_CORE \|\|		if ((lr->initiator == NL80211_REGDOM_SET_BY_CORE \|\|
	lr->initiator == NL80211_REGDOM_SET_BY_DRIVER \|\|		lr->initiator == NL80211_REGDOM_SET_BY_DRIVER \|\|
	lr->initiator == NL80211_REGDOM_SET_BY_USER) &&		lr->initiator == NL80211_REGDOM_SET_BY_USER)) {
	regdom_changes(lr->alpha2))		if (lr->intersect) {
			if (!is_cfg80211_regdom_intersected())
	return REG_REQ_IGNORE;		return REG_REQ_IGNORE;
			} else if (regdom_changes(lr->alpha2)) {
			return REG_REQ_IGNORE;
			}
			}

	if (!regdom_changes(user_request->alpha2))		if (!regdom_changes(user_request->alpha2))
	return REG_REQ_ALREADY_SET;		return REG_REQ_ALREADY_SET;