Merge tag 'mac80211-next-for-davem-2018-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== Highlights: * merge net-next, so I can finish the hwsim workqueue removal * fix TXQ NULL pointer issue that was reported multiple times * minstrel cleanups from Felix * simplify lib80211 code by not using skcipher, note that this will conflict with the crypto tree (and this new code here should be used) * use new netlink policy validation in nl80211 * fix up SAE (part of WPA3) in client-mode * FTM responder support in the stack ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
@@ -1033,6 +1033,9 @@
|
||||
* %NL80211_ATTR_CHANNEL_WIDTH,%NL80211_ATTR_NSS attributes with its
|
||||
* address(specified in %NL80211_ATTR_MAC).
|
||||
*
|
||||
* @NL80211_CMD_GET_FTM_RESPONDER_STATS: Retrieve FTM responder statistics, in
|
||||
* the %NL80211_ATTR_FTM_RESPONDER_STATS attribute.
|
||||
*
|
||||
* @NL80211_CMD_MAX: highest used command number
|
||||
* @__NL80211_CMD_AFTER_LAST: internal use
|
||||
*/
|
||||
@@ -1245,6 +1248,8 @@ enum nl80211_commands {
|
||||
|
||||
NL80211_CMD_CONTROL_PORT_FRAME,
|
||||
|
||||
NL80211_CMD_GET_FTM_RESPONDER_STATS,
|
||||
|
||||
/* add new commands above here */
|
||||
|
||||
/* used to define NL80211_CMD_MAX below */
|
||||
@@ -2241,6 +2246,14 @@ enum nl80211_commands {
|
||||
* association request when used with NL80211_CMD_NEW_STATION). Can be set
|
||||
* only if %NL80211_STA_FLAG_WME is set.
|
||||
*
|
||||
* @NL80211_ATTR_FTM_RESPONDER: nested attribute which user-space can include
|
||||
* in %NL80211_CMD_START_AP or %NL80211_CMD_SET_BEACON for fine timing
|
||||
* measurement (FTM) responder functionality and containing parameters as
|
||||
* possible, see &enum nl80211_ftm_responder_attr
|
||||
*
|
||||
* @NL80211_ATTR_FTM_RESPONDER_STATS: Nested attribute with FTM responder
|
||||
* statistics, see &enum nl80211_ftm_responder_stats.
|
||||
*
|
||||
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
|
||||
* @NL80211_ATTR_MAX: highest attribute number currently defined
|
||||
* @__NL80211_ATTR_AFTER_LAST: internal use
|
||||
@@ -2682,6 +2695,10 @@ enum nl80211_attrs {
|
||||
|
||||
NL80211_ATTR_HE_CAPABILITY,
|
||||
|
||||
NL80211_ATTR_FTM_RESPONDER,
|
||||
|
||||
NL80211_ATTR_FTM_RESPONDER_STATS,
|
||||
|
||||
/* add attributes here, update the policy in nl80211.c */
|
||||
|
||||
__NL80211_ATTR_AFTER_LAST,
|
||||
@@ -3051,6 +3068,12 @@ enum nl80211_sta_bss_param {
|
||||
* @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment
|
||||
* @NL80211_STA_INFO_ACK_SIGNAL: signal strength of the last ACK frame(u8, dBm)
|
||||
* @NL80211_STA_INFO_ACK_SIGNAL_AVG: avg signal strength of ACK frames (s8, dBm)
|
||||
* @NL80211_STA_INFO_RX_MPDUS: total number of received packets (MPDUs)
|
||||
* (u32, from this station)
|
||||
* @NL80211_STA_INFO_FCS_ERROR_COUNT: total number of packets (MPDUs) received
|
||||
* with an FCS error (u32, from this station). This count may not include
|
||||
* some packets with an FCS error due to TA corruption. Hence this counter
|
||||
* might not be fully accurate.
|
||||
* @__NL80211_STA_INFO_AFTER_LAST: internal
|
||||
* @NL80211_STA_INFO_MAX: highest possible station info attribute
|
||||
*/
|
||||
@@ -3091,6 +3114,8 @@ enum nl80211_sta_info {
|
||||
NL80211_STA_INFO_PAD,
|
||||
NL80211_STA_INFO_ACK_SIGNAL,
|
||||
NL80211_STA_INFO_ACK_SIGNAL_AVG,
|
||||
NL80211_STA_INFO_RX_MPDUS,
|
||||
NL80211_STA_INFO_FCS_ERROR_COUNT,
|
||||
|
||||
/* keep last */
|
||||
__NL80211_STA_INFO_AFTER_LAST,
|
||||
@@ -5225,6 +5250,8 @@ enum nl80211_feature_flags {
|
||||
* @NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT: Driver/device can omit all data
|
||||
* except for supported rates from the probe request content if requested
|
||||
* by the %NL80211_SCAN_FLAG_MIN_PREQ_CONTENT flag.
|
||||
* @NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER: Driver supports enabling fine
|
||||
* timing measurement responder role.
|
||||
*
|
||||
* @NL80211_EXT_FEATURE_CAN_REPLACE_PTK0: Driver/device confirm that they are
|
||||
* able to rekey an in-use key correctly. Userspace must not rekey PTK keys
|
||||
@@ -5269,6 +5296,7 @@ enum nl80211_ext_feature_index {
|
||||
NL80211_EXT_FEATURE_SCAN_RANDOM_SN,
|
||||
NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT,
|
||||
NL80211_EXT_FEATURE_CAN_REPLACE_PTK0,
|
||||
NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER,
|
||||
|
||||
/* add new features before the definition below */
|
||||
NUM_NL80211_EXT_FEATURES,
|
||||
@@ -5808,4 +5836,74 @@ enum nl80211_external_auth_action {
|
||||
NL80211_EXTERNAL_AUTH_ABORT,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum nl80211_ftm_responder_attributes - fine timing measurement
|
||||
* responder attributes
|
||||
* @__NL80211_FTM_RESP_ATTR_INVALID: Invalid
|
||||
* @NL80211_FTM_RESP_ATTR_ENABLED: FTM responder is enabled
|
||||
* @NL80211_FTM_RESP_ATTR_LCI: The content of Measurement Report Element
|
||||
* (9.4.2.22 in 802.11-2016) with type 8 - LCI (9.4.2.22.10)
|
||||
* @NL80211_FTM_RESP_ATTR_CIVIC: The content of Measurement Report Element
|
||||
* (9.4.2.22 in 802.11-2016) with type 11 - Civic (Section 9.4.2.22.13)
|
||||
* @__NL80211_FTM_RESP_ATTR_LAST: Internal
|
||||
* @NL80211_FTM_RESP_ATTR_MAX: highest FTM responder attribute.
|
||||
*/
|
||||
enum nl80211_ftm_responder_attributes {
|
||||
__NL80211_FTM_RESP_ATTR_INVALID,
|
||||
|
||||
NL80211_FTM_RESP_ATTR_ENABLED,
|
||||
NL80211_FTM_RESP_ATTR_LCI,
|
||||
NL80211_FTM_RESP_ATTR_CIVICLOC,
|
||||
|
||||
/* keep last */
|
||||
__NL80211_FTM_RESP_ATTR_LAST,
|
||||
NL80211_FTM_RESP_ATTR_MAX = __NL80211_FTM_RESP_ATTR_LAST - 1,
|
||||
};
|
||||
|
||||
/*
|
||||
* enum nl80211_ftm_responder_stats - FTM responder statistics
|
||||
*
|
||||
* These attribute types are used with %NL80211_ATTR_FTM_RESPONDER_STATS
|
||||
* when getting FTM responder statistics.
|
||||
*
|
||||
* @__NL80211_FTM_STATS_INVALID: attribute number 0 is reserved
|
||||
* @NL80211_FTM_STATS_SUCCESS_NUM: number of FTM sessions in which all frames
|
||||
* were ssfully answered (u32)
|
||||
* @NL80211_FTM_STATS_PARTIAL_NUM: number of FTM sessions in which part of the
|
||||
* frames were successfully answered (u32)
|
||||
* @NL80211_FTM_STATS_FAILED_NUM: number of failed FTM sessions (u32)
|
||||
* @NL80211_FTM_STATS_ASAP_NUM: number of ASAP sessions (u32)
|
||||
* @NL80211_FTM_STATS_NON_ASAP_NUM: number of non-ASAP sessions (u32)
|
||||
* @NL80211_FTM_STATS_TOTAL_DURATION_MSEC: total sessions durations - gives an
|
||||
* indication of how much time the responder was busy (u64, msec)
|
||||
* @NL80211_FTM_STATS_UNKNOWN_TRIGGERS_NUM: number of unknown FTM triggers -
|
||||
* triggers from initiators that didn't finish successfully the negotiation
|
||||
* phase with the responder (u32)
|
||||
* @NL80211_FTM_STATS_RESCHEDULE_REQUESTS_NUM: number of FTM reschedule requests
|
||||
* - initiator asks for a new scheduling although it already has scheduled
|
||||
* FTM slot (u32)
|
||||
* @NL80211_FTM_STATS_OUT_OF_WINDOW_TRIGGERS_NUM: number of FTM triggers out of
|
||||
* scheduled window (u32)
|
||||
* @NL80211_FTM_STATS_PAD: used for padding, ignore
|
||||
* @__NL80211_TXQ_ATTR_AFTER_LAST: Internal
|
||||
* @NL80211_FTM_STATS_MAX: highest possible FTM responder stats attribute
|
||||
*/
|
||||
enum nl80211_ftm_responder_stats {
|
||||
__NL80211_FTM_STATS_INVALID,
|
||||
NL80211_FTM_STATS_SUCCESS_NUM,
|
||||
NL80211_FTM_STATS_PARTIAL_NUM,
|
||||
NL80211_FTM_STATS_FAILED_NUM,
|
||||
NL80211_FTM_STATS_ASAP_NUM,
|
||||
NL80211_FTM_STATS_NON_ASAP_NUM,
|
||||
NL80211_FTM_STATS_TOTAL_DURATION_MSEC,
|
||||
NL80211_FTM_STATS_UNKNOWN_TRIGGERS_NUM,
|
||||
NL80211_FTM_STATS_RESCHEDULE_REQUESTS_NUM,
|
||||
NL80211_FTM_STATS_OUT_OF_WINDOW_TRIGGERS_NUM,
|
||||
NL80211_FTM_STATS_PAD,
|
||||
|
||||
/* keep last */
|
||||
__NL80211_FTM_STATS_AFTER_LAST,
|
||||
NL80211_FTM_STATS_MAX = __NL80211_FTM_STATS_AFTER_LAST - 1
|
||||
};
|
||||
|
||||
#endif /* __LINUX_NL80211_H */
|
||||
|
||||
Reference in New Issue
Block a user