Merge "wlan:Set reg treament as per reg domain change." (1a02bf1f) · Commits · e / devices / android_kernel_xiaomi_markw

net/wireless/reg.c

+5 −13

Original line number	Diff line number	Diff line
		@@ -1747,22 +1747,14 @@ __reg_process_hint_driver(struct regulatory_request *driver_request)
		{
		struct regulatory_request *lr = get_last_request();

		if (lr->initiator == NL80211_REGDOM_SET_BY_CORE) {
		if (regdom_changes(driver_request->alpha2))
		return REG_REQ_OK;
		return REG_REQ_ALREADY_SET;
		}

		/*
		* This would happen if you unplug and plug your card
		* back in or if you add a new device for which the previously
		* loaded card also agrees on the regulatory domain.
		*/
		if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER &&
		!regdom_changes(driver_request->alpha2))
		if (!regdom_changes(driver_request->alpha2))
		return REG_REQ_ALREADY_SET;

		if (lr->initiator == NL80211_REGDOM_SET_BY_USER)
		return REG_REQ_INTERSECT;
		else
		return REG_REQ_OK;

		}

		/**