Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / net / regulatory.h

diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 9e103a4e91eec69fb07c82cb9b9e5a02875cadc4..356d6e3dc20a581f9d1a529675ac69ab73559c5f 100644 (file)
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -43,6 +43,12 @@ enum environment_cap {
  * @intersect: indicates whether the wireless core should intersect
  *     the requested regulatory domain with the presently set regulatory
  *     domain.
+ * @processed: indicates whether or not this requests has already been
+ *     processed. When the last request is processed it means that the
+ *     currently regulatory domain set on cfg80211 is updated from
+ *     CRDA and can be used by other regulatory requests. When a
+ *     the last request is not yet processed we must yield until it
+ *     is processed before processing any new requests.
  * @country_ie_checksum: checksum of the last processed and accepted
  *     country IE
  * @country_ie_env: lets us know if the AP is telling us we are outdoor,
@@ -54,6 +60,7 @@ struct regulatory_request {
        enum nl80211_reg_initiator initiator;
        char alpha2[2];
        bool intersect;
+       bool processed;
        enum environment_cap country_ie_env;
        struct list_head list;
 };