Minor updates:
* BSS coloring support * MEI commands for Intel platforms * various fixes/cleanups -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEH1e1rEeCd0AIMq6MB8qZga/fl8QFAmEfiUEACgkQB8qZga/f l8QnDRAAiLKYLSfxTCf73KT/cUFOXPAAPG8r23tpgb1h/GgXcTVSTccnBfDWZWnv cX2YknF2hP3JU4SCjV28io+IvftlYp7gMua8yN6ekMQ31Dzw3kkVQbrNdF7sWglQ XhLws8KrZ6UwFSxqjSg1cX2oAYb6AwkDy5z+1lX+PxBoH5duVlWzCYe3ohXnuZgR 8Y9iz1eIxCprt1aXSIHyyT96a7TTG552T+FjenZM2+wHDu4sXGJLWSSUkM6rXUQI bXV1gon50VaqfmbAfusgmhSmmCfHqlx7P0sBKxdJ17WuuBf3FtGLQX07EzBU/0vD t3jSv4x4tXWhnA+Lyxx89WT13pz89iPnI4OjpxaxE+4wTOeiGrTZcHNMMHrgyEcQ f1PiEwwsTt5PM4y/e1rhdpm2Mrw3VxDOQ+A/vHPUzoLv7ewehGw8IGw6spocA+QL 1YB3g6tiVPEIbfczTY+qJy8E4MRh93toO3O2DywE+UXxC3OR8Eo/tFB+yREzCnnN 6jAMGrYYDONKSiU3x9NRlV5luqPmUa1Rwjv+dkg+g7jES1hAjZa+oKtPffDzzGOn C8bsN8TEiMyHtmtgi5IZQTIS0/rqKVV+rgA0DHoTqRVzuInA1Pmrx0k4H6Vy7zGA HahTJVPoO4VHWTtmztwkbONfEe0hR0OE/MGHgEqzdkbpIqVkMBw= =q8bL -----END PGP SIGNATURE----- Merge tag 'mac80211-next-for-net-next-2021-08-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Johannes Berg says: ==================== Minor updates: * BSS coloring support * MEI commands for Intel platforms * various fixes/cleanups * tag 'mac80211-next-for-net-next-2021-08-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next: cfg80211: fix BSS color notify trace enum confusion mac80211: Fix insufficient headroom issue for AMSDU mac80211: add support for BSS color change nl80211: add support for BSS coloring mac80211: Use flex-array for radiotap header bitmap mac80211: radiotap: Use BIT() instead of shifts mac80211: Remove unnecessary variable and label mac80211: include <linux/rbtree.h> mac80211: Fix monitor MTU limit so that A-MSDUs get through mac80211: remove unnecessary NULL check in ieee80211_register_hw() mac80211: Reject zero MAC address in sta_info_insert_check() nl80211: vendor-cmd: add Intel vendor commands for iwlmei usage ==================== Link: https://lore.kernel.org/r/20210820105329.48674-1-johannes@sipsolutions.net Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
commit
4af14dbaea
18 changed files with 764 additions and 63 deletions
77
include/uapi/linux/nl80211-vnd-intel.h
Normal file
77
include/uapi/linux/nl80211-vnd-intel.h
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
/*
|
||||
* Copyright (C) 2012-2014, 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2013-2015 Intel Mobile Communications GmbH
|
||||
* Copyright (C) 2016-2017 Intel Deutschland GmbH
|
||||
*/
|
||||
#ifndef __VENDOR_CMD_INTEL_H__
|
||||
#define __VENDOR_CMD_INTEL_H__
|
||||
|
||||
#define INTEL_OUI 0x001735
|
||||
|
||||
/**
|
||||
* enum iwl_mvm_vendor_cmd - supported vendor commands
|
||||
* @IWL_MVM_VENDOR_CMD_GET_CSME_CONN_INFO: reports CSME connection info.
|
||||
* @IWL_MVM_VENDOR_CMD_HOST_GET_OWNERSHIP: asks for ownership on the device.
|
||||
* @IWL_MVM_VENDOR_CMD_ROAMING_FORBIDDEN_EVENT: notifies if roaming is allowed.
|
||||
* It contains a &IWL_MVM_VENDOR_ATTR_ROAMING_FORBIDDEN and a
|
||||
* &IWL_MVM_VENDOR_ATTR_VIF_ADDR attributes.
|
||||
*/
|
||||
|
||||
enum iwl_mvm_vendor_cmd {
|
||||
IWL_MVM_VENDOR_CMD_GET_CSME_CONN_INFO = 0x2d,
|
||||
IWL_MVM_VENDOR_CMD_HOST_GET_OWNERSHIP = 0x30,
|
||||
IWL_MVM_VENDOR_CMD_ROAMING_FORBIDDEN_EVENT = 0x32,
|
||||
};
|
||||
|
||||
enum iwl_vendor_auth_akm_mode {
|
||||
IWL_VENDOR_AUTH_OPEN,
|
||||
IWL_VENDOR_AUTH_RSNA = 0x6,
|
||||
IWL_VENDOR_AUTH_RSNA_PSK,
|
||||
IWL_VENDOR_AUTH_SAE = 0x9,
|
||||
IWL_VENDOR_AUTH_MAX,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum iwl_mvm_vendor_attr - attributes used in vendor commands
|
||||
* @__IWL_MVM_VENDOR_ATTR_INVALID: attribute 0 is invalid
|
||||
* @IWL_MVM_VENDOR_ATTR_VIF_ADDR: interface MAC address
|
||||
* @IWL_MVM_VENDOR_ATTR_ADDR: MAC address
|
||||
* @IWL_MVM_VENDOR_ATTR_SSID: SSID (binary attribute, 0..32 octets)
|
||||
* @IWL_MVM_VENDOR_ATTR_STA_CIPHER: the cipher to use for the station with the
|
||||
* mac address specified in &IWL_MVM_VENDOR_ATTR_ADDR.
|
||||
* @IWL_MVM_VENDOR_ATTR_ROAMING_FORBIDDEN: u8 attribute. Indicates whether
|
||||
* roaming is forbidden or not. Value 1 means roaming is forbidden,
|
||||
* 0 mean roaming is allowed.
|
||||
* @IWL_MVM_VENDOR_ATTR_AUTH_MODE: u32 attribute. Authentication mode type
|
||||
* as specified in &enum iwl_vendor_auth_akm_mode.
|
||||
* @IWL_MVM_VENDOR_ATTR_CHANNEL_NUM: u8 attribute. Contains channel number.
|
||||
* @IWL_MVM_VENDOR_ATTR_BAND: u8 attribute.
|
||||
* 0 for 2.4 GHz band, 1 for 5.2GHz band and 2 for 6GHz band.
|
||||
* @IWL_MVM_VENDOR_ATTR_COLLOC_CHANNEL: u32 attribute. Channel number of
|
||||
* collocated AP. Relevant for 6GHz AP info.
|
||||
* @IWL_MVM_VENDOR_ATTR_COLLOC_ADDR: MAC address of a collocated AP.
|
||||
* Relevant for 6GHz AP info.
|
||||
*
|
||||
* @NUM_IWL_MVM_VENDOR_ATTR: number of vendor attributes
|
||||
* @MAX_IWL_MVM_VENDOR_ATTR: highest vendor attribute number
|
||||
|
||||
*/
|
||||
enum iwl_mvm_vendor_attr {
|
||||
__IWL_MVM_VENDOR_ATTR_INVALID = 0x00,
|
||||
IWL_MVM_VENDOR_ATTR_VIF_ADDR = 0x02,
|
||||
IWL_MVM_VENDOR_ATTR_ADDR = 0x0a,
|
||||
IWL_MVM_VENDOR_ATTR_SSID = 0x3d,
|
||||
IWL_MVM_VENDOR_ATTR_STA_CIPHER = 0x51,
|
||||
IWL_MVM_VENDOR_ATTR_ROAMING_FORBIDDEN = 0x64,
|
||||
IWL_MVM_VENDOR_ATTR_AUTH_MODE = 0x65,
|
||||
IWL_MVM_VENDOR_ATTR_CHANNEL_NUM = 0x66,
|
||||
IWL_MVM_VENDOR_ATTR_BAND = 0x69,
|
||||
IWL_MVM_VENDOR_ATTR_COLLOC_CHANNEL = 0x70,
|
||||
IWL_MVM_VENDOR_ATTR_COLLOC_ADDR = 0x71,
|
||||
|
||||
NUM_IWL_MVM_VENDOR_ATTR,
|
||||
MAX_IWL_MVM_VENDOR_ATTR = NUM_IWL_MVM_VENDOR_ATTR - 1,
|
||||
};
|
||||
|
||||
#endif /* __VENDOR_CMD_INTEL_H__ */
|
||||
|
|
@ -1185,6 +1185,21 @@
|
|||
* passed using %NL80211_ATTR_SAR_SPEC. %NL80211_ATTR_WIPHY is used to
|
||||
* specify the wiphy index to be applied to.
|
||||
*
|
||||
* @NL80211_CMD_OBSS_COLOR_COLLISION: This notification is sent out whenever
|
||||
* mac80211/drv detects a bss color collision.
|
||||
*
|
||||
* @NL80211_CMD_COLOR_CHANGE_REQUEST: This command is used to indicate that
|
||||
* userspace wants to change the BSS color.
|
||||
*
|
||||
* @NL80211_CMD_COLOR_CHANGE_STARTED: Notify userland, that a color change has
|
||||
* started
|
||||
*
|
||||
* @NL80211_CMD_COLOR_CHANGE_ABORTED: Notify userland, that the color change has
|
||||
* been aborted
|
||||
*
|
||||
* @NL80211_CMD_COLOR_CHANGE_COMPLETED: Notify userland that the color change
|
||||
* has completed
|
||||
*
|
||||
* @NL80211_CMD_MAX: highest used command number
|
||||
* @__NL80211_CMD_AFTER_LAST: internal use
|
||||
*/
|
||||
|
|
@ -1417,6 +1432,14 @@ enum nl80211_commands {
|
|||
|
||||
NL80211_CMD_SET_SAR_SPECS,
|
||||
|
||||
NL80211_CMD_OBSS_COLOR_COLLISION,
|
||||
|
||||
NL80211_CMD_COLOR_CHANGE_REQUEST,
|
||||
|
||||
NL80211_CMD_COLOR_CHANGE_STARTED,
|
||||
NL80211_CMD_COLOR_CHANGE_ABORTED,
|
||||
NL80211_CMD_COLOR_CHANGE_COMPLETED,
|
||||
|
||||
/* add new commands above here */
|
||||
|
||||
/* used to define NL80211_CMD_MAX below */
|
||||
|
|
@ -2560,6 +2583,16 @@ enum nl80211_commands {
|
|||
* disassoc events to indicate that an immediate reconnect to the AP
|
||||
* is desired.
|
||||
*
|
||||
* @NL80211_ATTR_OBSS_COLOR_BITMAP: bitmap of the u64 BSS colors for the
|
||||
* %NL80211_CMD_OBSS_COLOR_COLLISION event.
|
||||
*
|
||||
* @NL80211_ATTR_COLOR_CHANGE_COUNT: u8 attribute specifying the number of TBTT's
|
||||
* until the color switch event.
|
||||
* @NL80211_ATTR_COLOR_CHANGE_COLOR: u8 attribute specifying the color that we are
|
||||
* switching to
|
||||
* @NL80211_ATTR_COLOR_CHANGE_ELEMS: Nested set of attributes containing the IE
|
||||
* information for the time while performing a color switch.
|
||||
*
|
||||
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
|
||||
* @NL80211_ATTR_MAX: highest attribute number currently defined
|
||||
* @__NL80211_ATTR_AFTER_LAST: internal use
|
||||
|
|
@ -3057,6 +3090,12 @@ enum nl80211_attrs {
|
|||
|
||||
NL80211_ATTR_DISABLE_HE,
|
||||
|
||||
NL80211_ATTR_OBSS_COLOR_BITMAP,
|
||||
|
||||
NL80211_ATTR_COLOR_CHANGE_COUNT,
|
||||
NL80211_ATTR_COLOR_CHANGE_COLOR,
|
||||
NL80211_ATTR_COLOR_CHANGE_ELEMS,
|
||||
|
||||
/* add attributes here, update the policy in nl80211.c */
|
||||
|
||||
__NL80211_ATTR_AFTER_LAST,
|
||||
|
|
@ -5953,6 +5992,9 @@ enum nl80211_feature_flags {
|
|||
* frame protection for all management frames exchanged during the
|
||||
* negotiation and range measurement procedure.
|
||||
*
|
||||
* @NL80211_EXT_FEATURE_BSS_COLOR: The driver supports BSS color collision
|
||||
* detection and change announcemnts.
|
||||
*
|
||||
* @NUM_NL80211_EXT_FEATURES: number of extended features.
|
||||
* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
|
||||
*/
|
||||
|
|
@ -6017,6 +6059,7 @@ enum nl80211_ext_feature_index {
|
|||
NL80211_EXT_FEATURE_SECURE_LTF,
|
||||
NL80211_EXT_FEATURE_SECURE_RTT,
|
||||
NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE,
|
||||
NL80211_EXT_FEATURE_BSS_COLOR,
|
||||
|
||||
/* add new features before the definition below */
|
||||
NUM_NL80211_EXT_FEATURES,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue