update nl80211.h

diff --git a/nl80211.h b/nl80211.h
index b37bd5a1cb8253cd334ea05c3da920f0cf30f6e0..c0383e98354419d5b5caa710dd94e10409259fcb 100644 (file)
--- a/nl80211.h
+++ b/nl80211.h
@@ -252,7 +252,18 @@
  *     %NL80211_ATTR_IFINDEX.
  *
  * @NL80211_CMD_GET_REG: ask the wireless core to send us its currently set
- *     regulatory domain.
+ *     regulatory domain. If %NL80211_ATTR_WIPHY is specified and the device
+ *     has a private regulatory domain, it will be returned. Otherwise, the
+ *     global regdomain will be returned.
+ *     A device will have a private regulatory domain if it uses the
+ *     regulatory_hint() API. Even when a private regdomain is used the channel
+ *     information will still be mended according to further hints from
+ *     the regulatory core to help with compliance. A dump version of this API
+ *     is now available which will returns the global regdomain as well as
+ *     all private regdomains of present wiphys (for those that have it).
+ *     If a wiphy is self-managed (%NL80211_ATTR_WIPHY_SELF_MANAGED_REG), then
+ *     its private regdomain is the only valid one for it. The regulatory
+ *     core is not used to help with compliance in this case.
  * @NL80211_CMD_SET_REG: Set current regulatory domain. CRDA sends this command
  *     after being queried by the kernel. CRDA replies by sending a regulatory
  *     domain structure which consists of %NL80211_ATTR_REG_ALPHA set to our
@@ -774,6 +785,10 @@
  *     peer given by %NL80211_ATTR_MAC. Both peers must be on the base channel
  *     when this command completes.
  *
+ * @NL80211_CMD_WIPHY_REG_CHANGE: Similar to %NL80211_CMD_REG_CHANGE, but used
+ *     as an event to indicate changes for devices with wiphy-specific regdom
+ *     management.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -958,6 +973,8 @@ enum nl80211_commands {
        NL80211_CMD_TDLS_CHANNEL_SWITCH,
        NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH,
 
+       NL80211_CMD_WIPHY_REG_CHANGE,
+
        /* add new commands above here */
 
        /* used to define NL80211_CMD_MAX below */
@@ -1655,6 +1672,9 @@ enum nl80211_commands {
  * @NL80211_ATTR_SOCKET_OWNER: Flag attribute, if set during interface
  *     creation then the new interface will be owned by the netlink socket
  *     that created it and will be destroyed when the socket is closed.
+ *     If set during scheduled scan start then the new scan req will be
+ *     owned by the netlink socket that created it and the scheduled scan will
+ *     be stopped when the socket is closed.
  *
  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
  *     the TDLS link initiator.
@@ -1688,6 +1708,11 @@ enum nl80211_commands {
  *
  * @NL80211_ATTR_MAC_MASK: MAC address mask
  *
+ * @NL80211_ATTR_WIPHY_SELF_MANAGED_REG: flag attribute indicating this device
+ *     is self-managing its regulatory information and any regulatory domain
+ *     obtained from it is coming from the device's wiphy and not the global
+ *     cfg80211 regdomain.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2045,6 +2070,8 @@ enum nl80211_attrs {
 
        NL80211_ATTR_MAC_MASK,
 
+       NL80211_ATTR_WIPHY_SELF_MANAGED_REG,
+
        /* add attributes here, update the policy in nl80211.c */
 
        __NL80211_ATTR_AFTER_LAST,