Commit 579d03fe authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2018-09-05' of... 

Merge tag 'mac80211-next-for-davem-2018-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
This time, we have some pretty impactful work. Among
the changes:
 * changes to make PTK rekeying work better, or actually
   better/safely if drivers get updated
 * VHT extended NSS support - some APs had capabilities
   that didn't fit into the VHT (11ac) spec, so the spec
   was updated and we follow that now
 * some TXQ and A-MSDU building work - will allow iwlwifi
   to use this soon
 * more HE work, including aligning to 802.11ax Draft 3.0
 * L-SIG and 0-length-PSDU support in radiotap
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 36302685 014f5a25

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+38 −13
Original line number Diff line number Diff line
@@ -476,30 +476,40 @@ static struct ieee80211_sband_iftype_data iwl_he_capa = { 
		.has_he = true,

		.he_cap_elem = {

			.mac_cap_info[0] =

				IEEE80211_HE_MAC_CAP0_HTC_HE,

				IEEE80211_HE_MAC_CAP0_HTC_HE |

				IEEE80211_HE_MAC_CAP0_TWT_REQ,

			.mac_cap_info[1] =

				IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |

				IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_8,

				IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,

			.mac_cap_info[2] =

				IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP |

				IEEE80211_HE_MAC_CAP2_MU_CASCADING |

				IEEE80211_HE_MAC_CAP2_ACK_EN,

			.mac_cap_info[3] =

				IEEE80211_HE_MAC_CAP3_GRP_ADDR_MULTI_STA_BA_DL_MU |

				IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_VHT_2,

			.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

				IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

				IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

			.mac_cap_info[4] =

				IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU |

				IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39,

			.mac_cap_info[5] =

				IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40 |

				IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B41 |

				IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,

			.phy_cap_info[0] =

				IEEE80211_HE_PHY_CAP0_DUAL_BAND |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G,

			.phy_cap_info[1] =

				IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |

				IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |

				IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD |

				IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_MAX_NSTS,

				IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS,

			.phy_cap_info[2] =

				IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US |

				IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |

				IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ,

				IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ |

				IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO |

				IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO,

			.phy_cap_info[3] =

				IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |

				IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |
@@ -511,18 +521,31 @@ static struct ieee80211_sband_iftype_data iwl_he_capa = { 
				IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_8,

			.phy_cap_info[5] =

				IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 |

				IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,

				IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2 |

				IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK |

				IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK,

			.phy_cap_info[6] =

				IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU |

				IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |

				IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |

				IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |

				IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |

				IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO |

				IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,

			.phy_cap_info[7] =

				IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |

				IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |

				IEEE80211_HE_PHY_CAP7_MAX_NC_7,

				IEEE80211_HE_PHY_CAP7_MAX_NC_1,

			.phy_cap_info[8] =

				IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |

				IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |

				IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |

				IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU,

				IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU |

				IEEE80211_HE_PHY_CAP8_DCM_MAX_BW_160_OR_80P80_MHZ,

			.phy_cap_info[9] =

				IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |

				IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |

				IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB,

		},

		/*

		 * Set default Tx/Rx HE MCS NSS Support field. Indicate support
@@ -559,9 +582,11 @@ static void iwl_init_he_hw_capab(struct ieee80211_supported_band *sband, 
	/* If not 2x2, we need to indicate 1x1 in the Midamble RX Max NSTS */

	if ((tx_chains & rx_chains) != ANT_AB) {

		iwl_he_capa.he_cap.he_cap_elem.phy_cap_info[1] &=

			~IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_MAX_NSTS;

			~IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS;

		iwl_he_capa.he_cap.he_cap_elem.phy_cap_info[2] &=

			~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_MAX_NSTS;

			~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_TX_MAX_NSTS;

		iwl_he_capa.he_cap.he_cap_elem.phy_cap_info[7] &=

			~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK;

	}

}

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+0 −4
Original line number Diff line number Diff line
@@ -1978,10 +1978,6 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm, 
			sta_ctxt_cmd.htc_flags |=

				cpu_to_le32(IWL_HE_HTC_LINK_ADAP_BOTH);

	}

	if (sta->he_cap.he_cap_elem.mac_cap_info[2] &

	    IEEE80211_HE_MAC_CAP2_UL_MU_RESP_SCHED)

		sta_ctxt_cmd.htc_flags |=

			cpu_to_le32(IWL_HE_HTC_UL_MU_RESP_SCHED);

	if (sta->he_cap.he_cap_elem.mac_cap_info[2] & IEEE80211_HE_MAC_CAP2_BSR)

		sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_BSR_SUPP);

	if (sta->he_cap.he_cap_elem.mac_cap_info[3] &

drivers/net/wireless/mac80211_hwsim.c

+7 −11
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (c) 2008, Jouni Malinen <j@w1.fi>

 * Copyright (c) 2011, Javier Lopez <jlopex@gmail.com>

 * Copyright (c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -2529,23 +2530,20 @@ static const struct ieee80211_sband_iftype_data he_capa_2ghz = { 
				IEEE80211_HE_MAC_CAP0_HTC_HE,

			.mac_cap_info[1] =

				IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |

				IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_8,

				IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,

			.mac_cap_info[2] =

				IEEE80211_HE_MAC_CAP2_BSR |

				IEEE80211_HE_MAC_CAP2_MU_CASCADING |

				IEEE80211_HE_MAC_CAP2_ACK_EN,

			.mac_cap_info[3] =

				IEEE80211_HE_MAC_CAP3_GRP_ADDR_MULTI_STA_BA_DL_MU |

				IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

				IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_VHT_2,

				IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

			.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

			.phy_cap_info[0] =

				IEEE80211_HE_PHY_CAP0_DUAL_BAND,

			.phy_cap_info[1] =

				IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |

				IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |

				IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD |

				IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_MAX_NSTS,

				IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS,

			.phy_cap_info[2] =

				IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US |

				IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |
@@ -2579,18 +2577,16 @@ static const struct ieee80211_sband_iftype_data he_capa_5ghz = { 
				IEEE80211_HE_MAC_CAP0_HTC_HE,

			.mac_cap_info[1] =

				IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |

				IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_8,

				IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,

			.mac_cap_info[2] =

				IEEE80211_HE_MAC_CAP2_BSR |

				IEEE80211_HE_MAC_CAP2_MU_CASCADING |

				IEEE80211_HE_MAC_CAP2_ACK_EN,

			.mac_cap_info[3] =

				IEEE80211_HE_MAC_CAP3_GRP_ADDR_MULTI_STA_BA_DL_MU |

				IEEE80211_HE_MAC_CAP3_OMI_CONTROL |

				IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_VHT_2,

				IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,

			.mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,

			.phy_cap_info[0] =

				IEEE80211_HE_PHY_CAP0_DUAL_BAND |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |

				IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G,
@@ -2598,7 +2594,7 @@ static const struct ieee80211_sband_iftype_data he_capa_5ghz = { 
				IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |

				IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |

				IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD |

				IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_MAX_NSTS,

				IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS,

			.phy_cap_info[2] =

				IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US |

				IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |

include/linux/ieee80211.h

+81 −30
Original line number Diff line number Diff line
@@ -1460,13 +1460,16 @@ struct ieee80211_ht_operation { 
 *	STA can receive. Rate expressed in units of 1 Mbps.

 *	If this field is 0 this value should not be used to

 *	consider the highest RX data rate supported.

 *	The top 3 bits of this field are reserved.

 *	The top 3 bits of this field indicate the Maximum NSTS,total

 *	(a beamformee capability.)

 * @tx_mcs_map: TX MCS map 2 bits for each stream, total 8 streams

 * @tx_highest: Indicates highest long GI VHT PPDU data rate

 *	STA can transmit. Rate expressed in units of 1 Mbps.

 *	If this field is 0 this value should not be used to

 *	consider the highest TX data rate supported.

 *	The top 3 bits of this field are reserved.

 *	The top 2 bits of this field are reserved, the

 *	3rd bit from the top indiciates VHT Extended NSS BW

 *	Capability.

 */

struct ieee80211_vht_mcs_info {

	__le16 rx_mcs_map;
@@ -1475,6 +1478,13 @@ struct ieee80211_vht_mcs_info { 
	__le16 tx_highest;

} __packed;



/* for rx_highest */

#define IEEE80211_VHT_MAX_NSTS_TOTAL_SHIFT	13

#define IEEE80211_VHT_MAX_NSTS_TOTAL_MASK	(7 << IEEE80211_VHT_MAX_NSTS_TOTAL_SHIFT)



/* for tx_highest */

#define IEEE80211_VHT_EXT_NSS_BW_CAPABLE	(1 << 13)



/**

 * enum ieee80211_vht_mcs_support - VHT MCS support definitions

 * @IEEE80211_VHT_MCS_SUPPORT_0_7: MCSes 0-7 are supported for the
@@ -1545,11 +1555,11 @@ struct ieee80211_vht_operation { 
 * struct ieee80211_he_cap_elem - HE capabilities element

 *

 * This structure is the "HE capabilities element" fixed fields as

 * described in P802.11ax_D2.0 section 9.4.2.237.2 and 9.4.2.237.3

 * described in P802.11ax_D3.0 section 9.4.2.237.2 and 9.4.2.237.3

 */

struct ieee80211_he_cap_elem {

	u8 mac_cap_info[5];

	u8 phy_cap_info[9];

	u8 mac_cap_info[6];

	u8 phy_cap_info[11];

} __packed;



#define IEEE80211_TX_RX_MCS_NSS_DESC_MAX_LEN	5
@@ -1650,6 +1660,7 @@ struct ieee80211_mu_edca_param_set { 
#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ		0x00000004

#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ	0x00000008

#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK			0x0000000C

#define IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_SHIFT			2

#define IEEE80211_VHT_CAP_RXLDPC				0x00000010

#define IEEE80211_VHT_CAP_SHORT_GI_80				0x00000020

#define IEEE80211_VHT_CAP_SHORT_GI_160				0x00000040
@@ -1678,6 +1689,26 @@ struct ieee80211_mu_edca_param_set { 
#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB	0x0c000000

#define IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN			0x10000000

#define IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN			0x20000000

#define IEEE80211_VHT_CAP_EXT_NSS_BW_SHIFT			30

#define IEEE80211_VHT_CAP_EXT_NSS_BW_MASK			0xc0000000



/**

 * ieee80211_get_vht_max_nss - return max NSS for a given bandwidth/MCS

 * @cap: VHT capabilities of the peer

 * @bw: bandwidth to use

 * @mcs: MCS index to use

 * @ext_nss_bw_capable: indicates whether or not the local transmitter

 *	(rate scaling algorithm) can deal with the new logic

 *	(dot11VHTExtendedNSSBWCapable)

 *

 * Due to the VHT Extended NSS Bandwidth Support, the maximum NSS can

 * vary for a given BW/MCS. This function parses the data.

 *

 * Note: This function is exported by cfg80211.

 */

int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,

			      enum ieee80211_vht_chanwidth bw,

			      int mcs, bool ext_nss_bw_capable);



/* 802.11ax HE MAC capabilities */

#define IEEE80211_HE_MAC_CAP0_HTC_HE				0x01
@@ -1707,15 +1738,15 @@ struct ieee80211_mu_edca_param_set { 
#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_8US		0x04

#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US		0x08

#define IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK		0x0c

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_1		0x00

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_2		0x10

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_3		0x20

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_4		0x30

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_5		0x40

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_6		0x50

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_7		0x60

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_8		0x70

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_MASK		0x70

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_1		0x00

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_2		0x10

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_3		0x20

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_4		0x30

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_5		0x40

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_6		0x50

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_7		0x60

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8		0x70

#define IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_MASK		0x70



/* Link adaptation is split between byte HE_MAC_CAP1 and

 * HE_MAC_CAP2. It should be set only if IEEE80211_HE_MAC_CAP0_HTC_HE
@@ -1729,14 +1760,13 @@ struct ieee80211_mu_edca_param_set { 


#define IEEE80211_HE_MAC_CAP2_LINK_ADAPTATION			0x01

#define IEEE80211_HE_MAC_CAP2_ALL_ACK				0x02

#define IEEE80211_HE_MAC_CAP2_UL_MU_RESP_SCHED			0x04

#define IEEE80211_HE_MAC_CAP2_TRS				0x04

#define IEEE80211_HE_MAC_CAP2_BSR				0x08

#define IEEE80211_HE_MAC_CAP2_BCAST_TWT				0x10

#define IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP			0x20

#define IEEE80211_HE_MAC_CAP2_MU_CASCADING			0x40

#define IEEE80211_HE_MAC_CAP2_ACK_EN				0x80



#define IEEE80211_HE_MAC_CAP3_GRP_ADDR_MULTI_STA_BA_DL_MU	0x01

#define IEEE80211_HE_MAC_CAP3_OMI_CONTROL			0x02

#define IEEE80211_HE_MAC_CAP3_OFDMA_RA				0x04
@@ -1744,25 +1774,34 @@ struct ieee80211_mu_edca_param_set { 
 * A-MDPU Length Exponent field in the HT capabilities, VHT capabilities and the

 * same field in the HE capabilities.

 */

#define IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_USE_VHT	0x00

#define IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_VHT_1		0x08

#define IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_VHT_2		0x10

#define IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_RESERVED	0x18

#define IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_MASK		0x18

#define IEEE80211_HE_MAC_CAP3_A_AMSDU_FRAG			0x20

#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_USE_VHT	0x00

#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_1		0x08

#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2		0x10

#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_RESERVED	0x18

#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK		0x18

#define IEEE80211_HE_MAC_CAP3_AMSDU_FRAG			0x20

#define IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED			0x40

#define IEEE80211_HE_MAC_CAP3_RX_CTRL_FRAME_TO_MULTIBSS		0x80



#define IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG		0x01

#define IEEE80211_HE_MAC_CAP4_QTP				0x02

#define IEEE80211_HE_MAC_CAP4_BQR				0x04

#define IEEE80211_HE_MAC_CAP4_SR_RESP				0x08

#define IEEE80211_HE_MAC_CAP4_SRP_RESP				0x08

#define IEEE80211_HE_MAC_CAP4_NDP_FB_REP			0x10

#define IEEE80211_HE_MAC_CAP4_OPS				0x20

#define IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU			0x40

/* Multi TID agg TX is split between byte #4 and #5

 * The value is a combination of B39,B40,B41

 */

#define IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39		0x80



#define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40		0x01

#define IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B41		0x02

#define IEEE80211_HE_MAC_CAP5_SUBCHAN_SELECVITE_TRANSMISSION	0x04

#define IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU			0x08

#define IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX		0x10



/* 802.11ax HE PHY capabilities */

#define IEEE80211_HE_PHY_CAP0_DUAL_BAND					0x01

#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G		0x02

#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G	0x04

#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G		0x08
@@ -1779,10 +1818,10 @@ struct ieee80211_mu_edca_param_set { 
#define IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A				0x10

#define IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD			0x20

#define IEEE80211_HE_PHY_CAP1_HE_LTF_AND_GI_FOR_HE_PPDUS_0_8US		0x40

/* Midamble RX Max NSTS is split between byte #2 and byte #3 */

#define IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_MAX_NSTS			0x80

/* Midamble RX/TX Max NSTS is split between byte #2 and byte #3 */

#define IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS			0x80



#define IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_MAX_NSTS			0x01

#define IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_TX_MAX_NSTS			0x01

#define IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US			0x02

#define IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ			0x04

#define IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ			0x08
@@ -1883,7 +1922,19 @@ struct ieee80211_mu_edca_param_set { 
#define IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU			0x04

#define IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU			0x08

#define IEEE80211_HE_PHY_CAP8_HE_ER_SU_1XLTF_AND_08_US_GI		0x10

#define IEEE80211_HE_PHY_CAP8_MIDAMBLE_RX_2X_AND_1XLTF			0x20

#define IEEE80211_HE_PHY_CAP8_MIDAMBLE_RX_TX_2X_AND_1XLTF		0x20

#define IEEE80211_HE_PHY_CAP8_DCM_MAX_BW_20MHZ				0x00

#define IEEE80211_HE_PHY_CAP8_DCM_MAX_BW_40MHZ				0x40

#define IEEE80211_HE_PHY_CAP8_DCM_MAX_BW_80MHZ				0x80

#define IEEE80211_HE_PHY_CAP8_DCM_MAX_BW_160_OR_80P80_MHZ		0xc0

#define IEEE80211_HE_PHY_CAP8_DCM_MAX_BW_MASK				0xc0



#define IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM		0x01

#define IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK		0x02

#define IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU		0x04

#define IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU		0x08

#define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB	0x10

#define IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB	0x20



/* 802.11ax HE TX/RX MCS NSS Support  */

#define IEEE80211_TX_RX_MCS_NSS_SUPP_HIGHEST_MCS_POS			(3)
@@ -1963,8 +2014,8 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) 
#define IEEE80211_HE_OPERATION_TWT_REQUIRED			0x00000200

#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK		0x000ffc00

#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET		10

#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR		0x000100000

#define IEEE80211_HE_OPERATION_VHT_OPER_INFO			0x000200000

#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR		0x00100000

#define IEEE80211_HE_OPERATION_VHT_OPER_INFO			0x00200000

#define IEEE80211_HE_OPERATION_MULTI_BSSID_AP			0x10000000

#define IEEE80211_HE_OPERATION_TX_BSSID_INDICATOR		0x20000000

#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED		0x40000000

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -849,6 +849,7 @@ struct cfg80211_bitrate_mask { 
 * @beacon_rate: bitrate to be used for beacons

 * @ht_cap: HT capabilities (or %NULL if HT isn't enabled)

 * @vht_cap: VHT capabilities (or %NULL if VHT isn't enabled)

 * @he_cap: HE capabilities (or %NULL if HE isn't enabled)

 * @ht_required: stations must support HT

 * @vht_required: stations must support VHT

 */
@@ -874,6 +875,7 @@ struct cfg80211_ap_settings { 


	const struct ieee80211_ht_cap *ht_cap;

	const struct ieee80211_vht_cap *vht_cap;

	const struct ieee80211_he_cap_elem *he_cap;

	bool ht_required, vht_required;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE