ARM: SPEAr13xx: Fix static mapping table

[firefly-linux-kernel-4.4.55.git] / include / net / regulatory.h

diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index b07cdc9fa454a57fe43d1eea0235522c26d0c1a6..259992444e80ae0b88eaec4ff345d23fd8f81c75 100644 (file)
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -131,6 +131,11 @@ struct regulatory_request {
  *     all country IE information processed by the regulatory core. This will
  *     override %REGULATORY_COUNTRY_IE_FOLLOW_POWER as all country IEs will
  *     be ignored.
+ * @REGULATORY_ENABLE_RELAX_NO_IR: for devices that wish to allow the
+ *      NO_IR relaxation, which enables transmissions on channels on which
+ *      otherwise initiating radiation is not allowed. This will enable the
+ *      relaxations enabled under the CFG80211_REG_RELAX_NO_IR configuration
+ *      option
  */
 enum ieee80211_regulatory_flags {
        REGULATORY_CUSTOM_REG                   = BIT(0),
@@ -138,6 +143,7 @@ enum ieee80211_regulatory_flags {
        REGULATORY_DISABLE_BEACON_HINTS         = BIT(2),
        REGULATORY_COUNTRY_IE_FOLLOW_POWER      = BIT(3),
        REGULATORY_COUNTRY_IE_IGNORE            = BIT(4),
+       REGULATORY_ENABLE_RELAX_NO_IR           = BIT(5),
 };
 
 struct ieee80211_freq_range {
@@ -155,6 +161,7 @@ struct ieee80211_reg_rule {
        struct ieee80211_freq_range freq_range;
        struct ieee80211_power_rule power_rule;
        u32 flags;
+       u32 dfs_cac_ms;
 };
 
 struct ieee80211_regdomain {
@@ -172,14 +179,18 @@ struct ieee80211_regdomain {
 #define DBM_TO_MBM(gain) ((gain) * 100)
 #define MBM_TO_DBM(gain) ((gain) / 100)
 
-#define REG_RULE(start, end, bw, gain, eirp, reg_flags) \
-{                                                      \
-       .freq_range.start_freq_khz = MHZ_TO_KHZ(start), \
-       .freq_range.end_freq_khz = MHZ_TO_KHZ(end),     \
-       .freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw), \
-       .power_rule.max_antenna_gain = DBI_TO_MBI(gain),\
-       .power_rule.max_eirp = DBM_TO_MBM(eirp),        \
-       .flags = reg_flags,                             \
+#define REG_RULE_EXT(start, end, bw, gain, eirp, dfs_cac, reg_flags)   \
+{                                                                      \
+       .freq_range.start_freq_khz = MHZ_TO_KHZ(start),                 \
+       .freq_range.end_freq_khz = MHZ_TO_KHZ(end),                     \
+       .freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw),                 \
+       .power_rule.max_antenna_gain = DBI_TO_MBI(gain),                \
+       .power_rule.max_eirp = DBM_TO_MBM(eirp),                        \
+       .flags = reg_flags,                                             \
+       .dfs_cac_ms = dfs_cac,                                          \
 }
 
+#define REG_RULE(start, end, bw, gain, eirp, reg_flags) \
+       REG_RULE_EXT(start, end, bw, gain, eirp, 0, reg_flags)
+
 #endif