update nl80211.h

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/info.c b/info.c
index 317e7a3be6168968a6b6106b5eef5f309f7ccd1c..40dcc811a0c15ba2e47a98b97663f5286e737465 100644 (file)
--- a/info.c
+++ b/info.c
@@ -172,6 +172,7 @@ static void ext_feat_print(enum nl80211_ext_feature_index idx)
        ext_feat_case(AUTH_AND_DEAUTH_RANDOM_TA, "random auth/deauth transmitter address");
        ext_feat_case(OWE_OFFLOAD, "OWE DH element handling offload (client)");
        ext_feat_case(OWE_OFFLOAD_AP, "OWE DH element handling offload (AP)");
+       ext_feat_case(DFS_CONCURRENT, "DFS channel use under concurrent DFS master");
        }
 }
 

diff --git a/nl80211.h b/nl80211.h
index a682b54bd3badea415a234dec76d53ccd7ea1c54..1ccdcae24372227b2f811765128fa409e58e66ee 100644 (file)
--- a/nl80211.h
+++ b/nl80211.h
@@ -4256,6 +4256,14 @@ enum nl80211_wmm_rule {
  *     in current regulatory domain.
  * @NL80211_FREQUENCY_ATTR_PSD: Power spectral density (in dBm) that
  *     is allowed on this channel in current regulatory domain.
+ * @NL80211_FREQUENCY_ATTR_DFS_CONCURRENT: Operation on this channel is
+ *     allowed for peer-to-peer or adhoc communication under the control
+ *     of a DFS master which operates on the same channel (FCC-594280 D01
+ *     Section B.3). Should be used together with %NL80211_RRF_DFS only.
+ * @NL80211_FREQUENCY_ATTR_NO_UHB_VLP_CLIENT: Client connection to VLP AP
+ *     not allowed using this channel
+ * @NL80211_FREQUENCY_ATTR_NO_UHB_AFC_CLIENT: Client connection to AFC AP
+ *     not allowed using this channel
  * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
  *     currently defined
  * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
@@ -4295,6 +4303,9 @@ enum nl80211_frequency_attr {
        NL80211_FREQUENCY_ATTR_NO_320MHZ,
        NL80211_FREQUENCY_ATTR_NO_EHT,
        NL80211_FREQUENCY_ATTR_PSD,
+       NL80211_FREQUENCY_ATTR_DFS_CONCURRENT,
+       NL80211_FREQUENCY_ATTR_NO_UHB_VLP_CLIENT,
+       NL80211_FREQUENCY_ATTR_NO_UHB_AFC_CLIENT,
 
        /* keep last */
        __NL80211_FREQUENCY_ATTR_AFTER_LAST,
@@ -4500,6 +4511,12 @@ enum nl80211_sched_scan_match_attr {
  * @NL80211_RRF_NO_320MHZ: 320MHz operation not allowed
  * @NL80211_RRF_NO_EHT: EHT operation not allowed
  * @NL80211_RRF_PSD: Ruleset has power spectral density value
+ * @NL80211_RRF_DFS_CONCURRENT: Operation on this channel is allowed for
+       peer-to-peer or adhoc communication under the control of a DFS master
+       which operates on the same channel (FCC-594280 D01 Section B.3).
+       Should be used together with %NL80211_RRF_DFS only.
+ * @NL80211_RRF_NO_UHB_VLP_CLIENT: Client connection to VLP AP not allowed
+ * @NL80211_RRF_NO_UHB_AFC_CLIENT: Client connection to AFC AP not allowed
  */
 enum nl80211_reg_rule_flags {
        NL80211_RRF_NO_OFDM             = 1<<0,
@@ -4521,6 +4538,9 @@ enum nl80211_reg_rule_flags {
        NL80211_RRF_NO_320MHZ           = 1<<18,
        NL80211_RRF_NO_EHT              = 1<<19,
        NL80211_RRF_PSD                 = 1<<20,
+       NL80211_RRF_DFS_CONCURRENT      = 1<<21,
+       NL80211_RRF_NO_UHB_VLP_CLIENT   = 1<<22,
+       NL80211_RRF_NO_UHB_AFC_CLIENT   = 1<<23,
 };
 
 #define NL80211_RRF_PASSIVE_SCAN       NL80211_RRF_NO_IR
@@ -5076,9 +5096,12 @@ enum nl80211_bss_use_for {
  *     BSS isn't possible
  * @NL80211_BSS_CANNOT_USE_NSTR_NONPRIMARY: NSTR nonprimary links aren't
  *     supported by the device, and this BSS entry represents one.
+ * @NL80211_BSS_CANNOT_USE_UHB_PWR_MISMATCH: STA is not supporting
+ *     the AP power type (SP, VLP, AP) that the AP uses.
  */
 enum nl80211_bss_cannot_use_reasons {
        NL80211_BSS_CANNOT_USE_NSTR_NONPRIMARY  = 1 << 0,
+       NL80211_BSS_CANNOT_USE_UHB_PWR_MISMATCH = 1 << 1,
 };
 
 /**
@@ -6492,6 +6515,11 @@ enum nl80211_feature_flags {
  * @NL80211_EXT_FEATURE_OWE_OFFLOAD_AP: Driver/Device wants to do OWE DH IE
  *     handling in AP mode.
  *
+ * @NL80211_EXT_FEATURE_DFS_CONCURRENT: The device supports peer-to-peer or
+ *     ad hoc operation on DFS channels under the control of a concurrent
+ *     DFS master on the same channel as described in FCC-594280 D01
+ *     (Section B.3). This, for example, allows P2P GO and P2P clients to
+ *     operate on DFS channels as long as there's a concurrent BSS connection.
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
  */
@@ -6565,6 +6593,7 @@ enum nl80211_ext_feature_index {
        NL80211_EXT_FEATURE_AUTH_AND_DEAUTH_RANDOM_TA,
        NL80211_EXT_FEATURE_OWE_OFFLOAD,
        NL80211_EXT_FEATURE_OWE_OFFLOAD_AP,
+       NL80211_EXT_FEATURE_DFS_CONCURRENT,
 
        /* add new features before the definition below */
        NUM_NL80211_EXT_FEATURES,