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: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez 2009-01-22 15:05:47 -08:00 committed by John W. Linville
parent 34f573473a
commit 5eebade608

View File

@ -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 && if (last_request->initiator == REGDOM_SET_BY_USER &&
last_request->intersect) last_request->intersect)
return -EOPNOTSUPP; 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; return 0;
} }