Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e329357 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mac80211: update HE operation fields to D3.0"

parents 7ad58464 382781a7

drivers/net/wireless/ath/wil6210/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1547,7 +1547,7 @@ static int wil_freq_debugfs_show(struct seq_file *s, void *data) 
{

	struct wil6210_priv *wil = s->private;

	struct wireless_dev *wdev = wil->main_ndev->ieee80211_ptr;

	u16 freq = wdev->chandef.chan ? wdev->chandef.chan->center_freq : 0;

	u32 freq = wdev->chandef.chan ? wdev->chandef.chan->center_freq : 0;



	seq_printf(s, "Freq = %d\n", freq);

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

+188 −76
Original line number Diff line number Diff line
@@ -498,36 +498,47 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg, 
	vht_cap->vht_mcs.tx_mcs_map = vht_cap->vht_mcs.rx_mcs_map;

}



static struct ieee80211_sband_iftype_data iwl_he_capa = {

	.types_mask = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_AP),

static struct ieee80211_sband_iftype_data iwl_he_capa[] = {

	{

		.types_mask = BIT(NL80211_IFTYPE_STATION),

		.he_cap = {

			.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 |
@@ -539,23 +550,117 @@ 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_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 for up to 2 spatial streams and all

			 * MCS, without any special cases

			 */

			.he_mcs_nss_supp = {

				.rx_mcs_80 = cpu_to_le16(0xfffa),

				.tx_mcs_80 = cpu_to_le16(0xfffa),

				.rx_mcs_160 = cpu_to_le16(0xfffa),

				.tx_mcs_160 = cpu_to_le16(0xfffa),

				.rx_mcs_80p80 = cpu_to_le16(0xffff),

				.tx_mcs_80p80 = cpu_to_le16(0xffff),

			},

			/*

			 * Set default PPE thresholds, with PPET16 set to 0,

			 * PPET8 set to 7

			 */

			.ppe_thres = {0x61, 0x1c, 0xc7, 0x71},

		},

	},

	{

		.types_mask = BIT(NL80211_IFTYPE_AP),

		.he_cap = {

			.has_he = true,

			.he_cap_elem = {

				.mac_cap_info[0] =

					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_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_OMI_CONTROL |

					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_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_LDPC_CODING_IN_PAYLOAD |

					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,

				.phy_cap_info[3] =

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,

				.phy_cap_info[4] =

					IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |

					IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_8 |

					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_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_PPE_THRESHOLD_PRESENT,

				.phy_cap_info[7] =

					IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |

					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_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

		 * for up to 2 spatial streams and all MCS, without any special

		 * cases

			 * Set default Tx/Rx HE MCS NSS Support field.

			 * Indicate support for up to 2 spatial streams and all

			 * MCS, without any special cases

			 */

			.he_mcs_nss_supp = {

				.rx_mcs_80 = cpu_to_le16(0xfffa),
@@ -566,11 +671,12 @@ static struct ieee80211_sband_iftype_data iwl_he_capa = { 
				.tx_mcs_80p80 = cpu_to_le16(0xffff),

			},

			/*

		 * Set default PPE thresholds, with PPET16 set to 0, PPET8 set

		 * to 7

			 * Set default PPE thresholds, with PPET16 set to 0,

			 * PPET8 set to 7

			 */

			.ppe_thres = {0x61, 0x1c, 0xc7, 0x71},

		},

	},

};



static void iwl_init_he_hw_capab(struct ieee80211_supported_band *sband,
@@ -578,18 +684,24 @@ static void iwl_init_he_hw_capab(struct ieee80211_supported_band *sband, 
{

	if (sband->band == NL80211_BAND_2GHZ ||

	    sband->band == NL80211_BAND_5GHZ)

		sband->iftype_data = &iwl_he_capa;

		sband->iftype_data = iwl_he_capa;

	else

		return;



	sband->n_iftype_data = 1;

	sband->n_iftype_data = ARRAY_SIZE(iwl_he_capa);



	/* 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;

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

			~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_MAX_NSTS;

		int i;



		for (i = 0; i < sband->n_iftype_data; i++) {

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

				~IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS;

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

				~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_TX_MAX_NSTS;

			iwl_he_capa[i].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
@@ -2001,10 +2001,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
@@ -2528,23 +2529,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 |
@@ -2578,18 +2576,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,
@@ -2597,7 +2593,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

+59 −39
Original line number Diff line number Diff line
@@ -1554,11 +1554,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
@@ -1616,7 +1616,7 @@ struct ieee80211_he_mcs_nss_supp { 
 * struct ieee80211_he_operation - HE capabilities element

 *

 * This structure is the "HE operation element" fields as

 * described in P802.11ax_D2.0 section 9.4.2.238

 * described in P802.11ax_D3.0 section 9.4.2.238

 */

struct ieee80211_he_operation {

	__le32 he_oper_params;
@@ -1716,15 +1716,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
@@ -1738,14 +1738,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
@@ -1753,25 +1752,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
@@ -1788,10 +1796,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
@@ -1892,7 +1900,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)
@@ -1966,17 +1986,17 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) 
}



/* HE Operation defines */

#define IEEE80211_HE_OPERATION_BSS_COLOR_MASK			0x0000003f

#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK		0x000001c0

#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_OFFSET		6

#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_MULTI_BSSID_AP			0x10000000

#define IEEE80211_HE_OPERATION_TX_BSSID_INDICATOR		0x20000000

#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED		0x40000000

#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK		0x00000003

#define IEEE80211_HE_OPERATION_TWT_REQUIRED			0x00000008

#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK		0x00003ff0

#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET		4

#define IEEE80211_HE_OPERATION_VHT_OPER_INFO			0x00004000

#define IEEE80211_HE_OPERATION_CO_LOCATED_BSS			0x00008000

#define IEEE80211_HE_OPERATION_ER_SU_DISABLE			0x00010000

#define IEEE80211_HE_OPERATION_BSS_COLOR_MASK			0x3f000000

#define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET		24

#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR		0x40000000

#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED		0x80000000



/*

 * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size
@@ -2001,7 +2021,7 @@ ieee80211_he_oper_size(const u8 *he_oper_ie) 
	he_oper_params = le32_to_cpu(he_oper->he_oper_params);

	if (he_oper_params & IEEE80211_HE_OPERATION_VHT_OPER_INFO)

		oper_len += 3;

	if (he_oper_params & IEEE80211_HE_OPERATION_MULTI_BSSID_AP)

	if (he_oper_params & IEEE80211_HE_OPERATION_CO_LOCATED_BSS)

		oper_len++;



	/* Add the first byte (extension ID) to the total length */