From 082972837f2692d57eadaebaffd715291041c7b5 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 22 Jan 2009 15:05:47 -0800 Subject: [PATCH] --- yaml --- r: 134215 b: refs/heads/master c: 5eebade608d695e30e89d4c5ca6136a58f24ed14 h: refs/heads/master i: 134213: fb3110fb73a0dc6b00164ebbdfaba0f7ab04fccc 134211: c6d5745cc8bfc913c49e3879a0fdd01ea2b75e81 134207: eb4d2050f70d3f2322d86bc277f9e82f8b72039a v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6ad4265b4281..25da1882761d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34f573473a659f8c2727d8d408e17b241900c28e +refs/heads/master: 5eebade608d695e30e89d4c5ca6136a58f24ed14 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index d663795d6944..4d2d2d4cc0d4 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -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; }