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>

1 files changed, 10 insertions, 0 deletions

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index d663795d6944..4d2d2d4cc0d4 100644
--- a/net/wireless/reg.c
+++ b/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;
         }