History

Merge tag 'mac80211-next-for-net-next-2021-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says: ==================== Another set of updates, all over the map: * set sk_pacing_shift for 802.3->802.11 encap offload * some monitor support for 802.11->802.3 decap offload * HE (802.11ax) spec updates * userspace API for TDLS HE support * along with various other small features, cleanups and fixups ====================

David S. Miller committed 5 years ago

Commit 08322282 parents c9ad205 010bfbe30 files · +232 −149Browse files

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

Unified · Split

include/uapi/linux/nl80211.h+22−0
@@ -655,6 +655,9 @@ · 654 unmodified lines
655 * When a security association was established on an 802.1X network using655 * When a security association was established on an 802.1X network using
656 * fast transition, this event should be followed by an656 * fast transition, this event should be followed by an
657 * %NL80211_CMD_PORT_AUTHORIZED event.657 * %NL80211_CMD_PORT_AUTHORIZED event.
658 * Following a %NL80211_CMD_ROAM event userspace can issue
659 * %NL80211_CMD_GET_SCAN in order to obtain the scan information for the
660 * new BSS the card/driver roamed to.
658 * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify661 * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
659 * userspace that a connection was dropped by the AP or due to other662 * userspace that a connection was dropped by the AP or due to other
660 * reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and663 * reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
@@ -5937,6 +5940,16 @@ enum nl80211_feature_flags { · 5276 unmodified lines
5937 * @NL80211_EXT_FEATURE_BEACON_RATE_HE: Driver supports beacon rate5940 * @NL80211_EXT_FEATURE_BEACON_RATE_HE: Driver supports beacon rate
5938 * configuration (AP/mesh) with HE rates.5941 * configuration (AP/mesh) with HE rates.
5939 *5942 *
5943 * @NL80211_EXT_FEATURE_SECURE_LTF: Device supports secure LTF measurement
5944 * exchange protocol.
5945 *
5946 * @NL80211_EXT_FEATURE_SECURE_RTT: Device supports secure RTT measurement
5947 * exchange protocol.
5948 *
5949 * @NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE: Device supports management
5950 * frame protection for all management frames exchanged during the
5951 * negotiation and range measurement procedure.
5952 *
5940 * @NUM_NL80211_EXT_FEATURES: number of extended features.5953 * @NUM_NL80211_EXT_FEATURES: number of extended features.
5941 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.5954 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
5942 */5955 */
@@ -5998,6 +6011,9 @@ enum nl80211_ext_feature_index { · 55 unmodified lines
5998 NL80211_EXT_FEATURE_FILS_DISCOVERY,6011 NL80211_EXT_FEATURE_FILS_DISCOVERY,
5999 NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP,6012 NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP,
6000 NL80211_EXT_FEATURE_BEACON_RATE_HE,6013 NL80211_EXT_FEATURE_BEACON_RATE_HE,
6014 NL80211_EXT_FEATURE_SECURE_LTF,
6015 NL80211_EXT_FEATURE_SECURE_RTT,
6016 NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE,
6001 6017
6002 /* add new features before the definition below */6018 /* add new features before the definition below */
6003 NUM_NL80211_EXT_FEATURES,6019 NUM_NL80211_EXT_FEATURES,
@@ -6295,11 +6311,13 @@ struct nl80211_vendor_cmd_info { · 291 unmodified lines
6295 * @NL80211_TDLS_PEER_HT: TDLS peer is HT capable.6311 * @NL80211_TDLS_PEER_HT: TDLS peer is HT capable.
6296 * @NL80211_TDLS_PEER_VHT: TDLS peer is VHT capable.6312 * @NL80211_TDLS_PEER_VHT: TDLS peer is VHT capable.
6297 * @NL80211_TDLS_PEER_WMM: TDLS peer is WMM capable.6313 * @NL80211_TDLS_PEER_WMM: TDLS peer is WMM capable.
6314 * @NL80211_TDLS_PEER_HE: TDLS peer is HE capable.
6298 */6315 */
6299enum nl80211_tdls_peer_capability {6316enum nl80211_tdls_peer_capability {
6300 NL80211_TDLS_PEER_HT = 1<<0,6317 NL80211_TDLS_PEER_HT = 1<<0,
6301 NL80211_TDLS_PEER_VHT = 1<<1,6318 NL80211_TDLS_PEER_VHT = 1<<1,
6302 NL80211_TDLS_PEER_WMM = 1<<2,6319 NL80211_TDLS_PEER_WMM = 1<<2,
6320 NL80211_TDLS_PEER_HE = 1<<3,
6303};6321};
6304 6322
6305/**6323/**
@@ -6891,6 +6909,9 @@ enum nl80211_peer_measurement_ftm_capa { · 585 unmodified lines
6891 * if neither %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED nor6909 * if neither %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED nor
6892 * %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set, EDCA based6910 * %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set, EDCA based
6893 * ranging will be used.6911 * ranging will be used.
6912 * @NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK: negotiate for LMR feedback. Only
6913 * valid if either %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED or
6914 * %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set.
6894 *6915 *
6895 * @NUM_NL80211_PMSR_FTM_REQ_ATTR: internal6916 * @NUM_NL80211_PMSR_FTM_REQ_ATTR: internal
6896 * @NL80211_PMSR_FTM_REQ_ATTR_MAX: highest attribute number6917 * @NL80211_PMSR_FTM_REQ_ATTR_MAX: highest attribute number
@@ -6909,6 +6930,7 @@ enum nl80211_peer_measurement_ftm_req { · 12 unmodified lines
6909 NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC,6930 NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC,
6910 NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED,6931 NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED,
6911 NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED,6932 NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED,
6933 NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK,
6912 6934
6913 /* keep last */6935 /* keep last */
6914 NUM_NL80211_PMSR_FTM_REQ_ATTR,6936 NUM_NL80211_PMSR_FTM_REQ_ATTR,