-@@ -4115,6 +4208,27 @@ enum nl80211_channel_type {
- };
-
- /**
-+ * enum nl80211_key_mode - Key mode
-+ *
-+ * @NL80211_KEY_RX_TX: (Default)
-+ * Key can be used for Rx and Tx immediately
-+ *
-+ * The following modes can only be selected for unicast keys and when the
-+ * driver supports @NL80211_EXT_FEATURE_EXT_KEY_ID:
-+ *
-+ * @NL80211_KEY_NO_TX: Only allowed in combination with @NL80211_CMD_NEW_KEY:
-+ * Unicast key can only be used for Rx, Tx not allowed, yet
-+ * @NL80211_KEY_SET_TX: Only allowed in combination with @NL80211_CMD_SET_KEY:
-+ * The unicast key identified by idx and mac is cleared for Tx and becomes
-+ * the preferred Tx key for the station.
-+ */
-+enum nl80211_key_mode {
-+ NL80211_KEY_RX_TX,
-+ NL80211_KEY_NO_TX,
-+ NL80211_KEY_SET_TX
-+};
-+
-+/**
- * enum nl80211_chan_width - channel width definitions
- *
- * These values are used with the %NL80211_ATTR_CHANNEL_WIDTH
-@@ -4319,6 +4433,7 @@ enum nl80211_mfp {
- enum nl80211_wpa_versions {
- NL80211_WPA_VERSION_1 = 1 << 0,
- NL80211_WPA_VERSION_2 = 1 << 1,
-+ NL80211_WPA_VERSION_3 = 1 << 2,
- };
-
- /**
-@@ -4357,6 +4472,9 @@ enum nl80211_key_default_types {
- * @NL80211_KEY_DEFAULT_TYPES: A nested attribute containing flags
- * attributes, specifying what a key should be set as default as.
- * See &enum nl80211_key_default_types.
-+ * @NL80211_KEY_MODE: the mode from enum nl80211_key_mode.
-+ * Defaults to @NL80211_KEY_RX_TX.
-+ *
- * @__NL80211_KEY_AFTER_LAST: internal
- * @NL80211_KEY_MAX: highest key attribute
- */
-@@ -4370,6 +4488,7 @@ enum nl80211_key_attributes {
- NL80211_KEY_DEFAULT_MGMT,
- NL80211_KEY_TYPE,
- NL80211_KEY_DEFAULT_TYPES,
-+ NL80211_KEY_MODE,
-
- /* keep last */
- __NL80211_KEY_AFTER_LAST,
-@@ -5223,7 +5342,7 @@ enum nl80211_feature_flags {
- NL80211_FEATURE_TDLS_CHANNEL_SWITCH = 1 << 28,
- NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR = 1 << 29,
- NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR = 1 << 30,
-- NL80211_FEATURE_ND_RANDOM_MAC_ADDR = 1 << 31,
-+ NL80211_FEATURE_ND_RANDOM_MAC_ADDR = 1U << 31,
- };
-
- /**
-@@ -5315,6 +5434,24 @@ enum nl80211_feature_flags {
- * able to rekey an in-use key correctly. Userspace must not rekey PTK keys
- * if this flag is not set. Ignoring this can leak clear text packets and/or
- * freeze the connection.
-+ * @NL80211_EXT_FEATURE_EXT_KEY_ID: Driver supports "Extended Key ID for
-+ * Individually Addressed Frames" from IEEE802.11-2016.
-+ *
-+ * @NL80211_EXT_FEATURE_AIRTIME_FAIRNESS: Driver supports getting airtime
-+ * fairness for transmitted packets and has enabled airtime fairness
-+ * scheduling.
-+ *
-+ * @NL80211_EXT_FEATURE_AP_PMKSA_CACHING: Driver/device supports PMKSA caching
-+ * (set/del PMKSA operations) in AP mode.
-+ *
-+ * @NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD: Driver supports
-+ * filtering of sched scan results using band specific RSSI thresholds.
-+ *
-+ * @NL80211_EXT_FEATURE_STA_TX_PWR: This driver supports controlling tx power
-+ * to a station.
-+ *
-+ * @NL80211_EXT_FEATURE_SAE_OFFLOAD: Device wants to do SAE authentication in
-+ * station mode (SAE password is passed as part of the connect command).
- *
- * @NUM_NL80211_EXT_FEATURES: number of extended features.
- * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
-@@ -5355,6 +5492,12 @@ enum nl80211_ext_feature_index {
- NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT,
- NL80211_EXT_FEATURE_CAN_REPLACE_PTK0,
- NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER,
-+ NL80211_EXT_FEATURE_AIRTIME_FAIRNESS,
-+ NL80211_EXT_FEATURE_AP_PMKSA_CACHING,
-+ NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD,
-+ NL80211_EXT_FEATURE_EXT_KEY_ID,
-+ NL80211_EXT_FEATURE_STA_TX_PWR,
-+ NL80211_EXT_FEATURE_SAE_OFFLOAD,
-
- /* add new features before the definition below */
- NUM_NL80211_EXT_FEATURES,
-@@ -5606,9 +5749,14 @@ enum nl80211_crit_proto_id {
- * Used by cfg80211_rx_mgmt()
- *
- * @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver.
-+ * @NL80211_RXMGMT_FLAG_EXTERNAL_AUTH: Host driver intends to offload
-+ * the authentication. Exclusively defined for host drivers that
-+ * advertises the SME functionality but would like the userspace
-+ * to handle certain authentication algorithms (e.g. SAE).
- */
- enum nl80211_rxmgmt_flags {
- NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0,
-+ NL80211_RXMGMT_FLAG_EXTERNAL_AUTH = 1 << 1,