Commit 5eebade6 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

cfg80211: process user requests only after previous user/driver/core requests



This prevents user regulatory changes to be considered prior to previous
pending user, core or driver requests which have not be applied.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 34f57347
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,16 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by,
		if (last_request->initiator == REGDOM_SET_BY_USER &&
			  last_request->intersect)
			return -EOPNOTSUPP;
		/* Process user requests only after previous user/driver/core
		 * requests have been processed */
		if (last_request->initiator == REGDOM_SET_BY_CORE ||
		    last_request->initiator == REGDOM_SET_BY_DRIVER ||
		    last_request->initiator == REGDOM_SET_BY_USER) {
			if (!alpha2_equal(last_request->alpha2,
			    cfg80211_regdomain->alpha2))
				return -EAGAIN;
		}

		return 0;
	}