History

Merge tag 'mac80211-next-for-net-next-2020-11-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says: ==================== Some updates: * injection/radiotap updates for new test capabilities * remove WDS support - even years ago when we turned it off by default it was already basically unusable * support for HE (802.11ax) rates for beacons * support for some vendor-specific HE rates * many other small features/cleanups * tag 'mac80211-next-for-net-next-2020-11-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next: (21 commits) nl80211: fix kernel-doc warning in the new SAE attribute cfg80211: remove WDS code mac80211: remove WDS-related code rt2x00: remove WDS code b43legacy: remove WDS code b43: remove WDS code carl9170: remove WDS code ath9k: remove WDS code wireless: remove CONFIG_WIRELESS_WDS mac80211: assure that certain drivers adhere to DONT_REORDER flag mac80211: don't overwrite QoS TID of injected frames mac80211: adhere to Tx control flag that prevents frame reordering mac80211: add radiotap flag to assure frames are not reordered mac80211: save HE oper info in BSS config for mesh cfg80211: add support to configure HE MCS for beacon rate nl80211: fix beacon tx rate mask validation nl80211/cfg80211: fix potential infinite loop cfg80211: Add support to calculate and report 4096-QAM HE rates cfg80211: Add support to configure SAE PWE value to drivers ieee80211: Add definition for WFA DPP ... ====================

Jakub Kicinski committed 6 years ago

Commit f8fd36b2 parents e1d9d7b da1e9dd38 files · +198 −347Browse files

Showing the changes to include/uapi (1 of 38 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+35−3
@@ -757,7 +757,8 @@ · 756 unmodified lines
757757 * of any other interfaces, and other interfaces will again take
758758 * precedence when they are used.
759759 *
760− * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface.
760+ * @NL80211_CMD_SET_WDS_PEER: Set the MAC address of the peer on a WDS interface
761+ * (no longer supported).
761762 *
762763 * @NL80211_CMD_SET_MULTICAST_TO_UNICAST: Configure if this AP should perform
763764 * multicast to unicast conversion. When enabled, all multicast packets
@@ -1750,8 +1751,9 @@ enum nl80211_commands { · 986 unmodified lines
17501751 * specify just a single bitrate, which is to be used for the beacon.
17511752 * The driver must also specify support for this with the extended
17521753 * features NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
1753− * NL80211_EXT_FEATURE_BEACON_RATE_HT and
1754− * NL80211_EXT_FEATURE_BEACON_RATE_VHT.
1754+ * NL80211_EXT_FEATURE_BEACON_RATE_HT,
1755+ * NL80211_EXT_FEATURE_BEACON_RATE_VHT and
1756+ * NL80211_EXT_FEATURE_BEACON_RATE_HE.
17551757 *
17561758 * @NL80211_ATTR_FRAME_MATCH: A binary attribute which typically must contain
17571759 * at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.
@@ -2527,6 +2529,11 @@ enum nl80211_commands { · 769 unmodified lines
25272529 * override mask. Used with NL80211_ATTR_S1G_CAPABILITY in
25282530 * NL80211_CMD_ASSOCIATE or NL80211_CMD_CONNECT.
25292531 *
2532+ * @NL80211_ATTR_SAE_PWE: Indicates the mechanism(s) allowed for SAE PWE
2533+ * derivation in WPA3-Personal networks which are using SAE authentication.
2534+ * This is a u8 attribute that encapsulates one of the values from
2535+ * &enum nl80211_sae_pwe_mechanism.
2536+ *
25302537 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
25312538 * @NL80211_ATTR_MAX: highest attribute number currently defined
25322539 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3016,6 +3023,8 @@ enum nl80211_attrs { · 483 unmodified lines
30163023 NL80211_ATTR_S1G_CAPABILITY,
30173024 NL80211_ATTR_S1G_CAPABILITY_MASK,
30183025
3026+ NL80211_ATTR_SAE_PWE,
3027+
30193028 /* add attributes here, update the policy in nl80211.c */
30203029
30213030 __NL80211_ATTR_AFTER_LAST,
@@ -5896,6 +5905,9 @@ enum nl80211_feature_flags { · 2874 unmodified lines
58965905 * @NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP: Driver/device supports
58975906 * unsolicited broadcast probe response transmission
58985907 *
5908+ * @NL80211_EXT_FEATURE_BEACON_RATE_HE: Driver supports beacon rate
5909+ * configuration (AP/mesh) with HE rates.
5910+ *
58995911 * @NUM_NL80211_EXT_FEATURES: number of extended features.
59005912 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
59015913 */
@@ -5956,6 +5968,7 @@ enum nl80211_ext_feature_index { · 54 unmodified lines
59565968 NL80211_EXT_FEATURE_SAE_OFFLOAD_AP,
59575969 NL80211_EXT_FEATURE_FILS_DISCOVERY,
59585970 NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP,
5971+ NL80211_EXT_FEATURE_BEACON_RATE_HE,
59595972
59605973 /* add new features before the definition below */
59615974 NUM_NL80211_EXT_FEATURES,
@@ -7124,4 +7137,23 @@ enum nl80211_unsol_bcast_probe_resp_attributes { · 1162 unmodified lines
71247137 NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX =
71257138 __NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_LAST - 1
71267139 };
7140+
7141+/**
7142+ * enum nl80211_sae_pwe_mechanism - The mechanism(s) allowed for SAE PWE
7143+ * derivation. Applicable only when WPA3-Personal SAE authentication is
7144+ * used.
7145+ *
7146+ * @NL80211_SAE_PWE_UNSPECIFIED: not specified, used internally to indicate that
7147+ * attribute is not present from userspace.
7148+ * @NL80211_SAE_PWE_HUNT_AND_PECK: hunting-and-pecking loop only
7149+ * @NL80211_SAE_PWE_HASH_TO_ELEMENT: hash-to-element only
7150+ * @NL80211_SAE_PWE_BOTH: both hunting-and-pecking loop and hash-to-element
7151+ * can be used.
7152+ */
7153+enum nl80211_sae_pwe_mechanism {
7154+ NL80211_SAE_PWE_UNSPECIFIED,
7155+ NL80211_SAE_PWE_HUNT_AND_PECK,
7156+ NL80211_SAE_PWE_HASH_TO_ELEMENT,
7157+ NL80211_SAE_PWE_BOTH,
7158+};
71277159 #endif /* __LINUX_NL80211_H */