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

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

Merge "cfg80211: reject HT/VHT capabilities on 6 GHz band"

parents 9e329357 f0eb686e

drivers/net/wireless/intel/iwlwifi/fw/api/mac.h

+24 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

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

 * it under the terms of version 2 of the GNU General Public License as
@@ -29,7 +29,7 @@ 
 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -432,6 +432,28 @@ struct iwl_he_backoff_conf { 
	__le16 mu_time;

} __packed; /* AC_QOS_DOT11AX_API_S */



/**

 * enum iwl_he_pkt_ext_constellations - PPE constellation indices

 * @IWL_HE_PKT_EXT_BPSK: BPSK

 * @IWL_HE_PKT_EXT_QPSK:  QPSK

 * @IWL_HE_PKT_EXT_16QAM: 16-QAM

 * @IWL_HE_PKT_EXT_64QAM: 64-QAM

 * @IWL_HE_PKT_EXT_256QAM: 256-QAM

 * @IWL_HE_PKT_EXT_1024QAM: 1024-QAM

 * @IWL_HE_PKT_EXT_RESERVED: reserved value

 * @IWL_HE_PKT_EXT_NONE: not defined

 */

enum iwl_he_pkt_ext_constellations {

	IWL_HE_PKT_EXT_BPSK = 0,

	IWL_HE_PKT_EXT_QPSK,

	IWL_HE_PKT_EXT_16QAM,

	IWL_HE_PKT_EXT_64QAM,

	IWL_HE_PKT_EXT_256QAM,

	IWL_HE_PKT_EXT_1024QAM,

	IWL_HE_PKT_EXT_RESERVED,

	IWL_HE_PKT_EXT_NONE,

};



#define MAX_HE_SUPP_NSS	2

#define MAX_HE_CHANNEL_BW_INDX	4

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

+21 −37
Original line number Diff line number Diff line
@@ -512,7 +512,6 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					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_OMI_CONTROL |
@@ -523,7 +522,9 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
				.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,

					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU |

					IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS |

					IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX,

				.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 |
@@ -531,18 +532,13 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
				.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_TX_MAX_NSTS,

					IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD,

				.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_UL_MU_FULL_MU_MIMO |

					IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO,

					IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US,

				.phy_cap_info[3] =

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,

				.phy_cap_info[4] =

					IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |
@@ -550,16 +546,8 @@ 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_NG16_SU_FEEDBACK |

					IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK,

					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,

				.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 |
@@ -570,11 +558,12 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					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,

					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_2x996,

				.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,

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |

					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,

			},

			/*

			 * Set default Tx/Rx HE MCS NSS Support field.
@@ -608,28 +597,26 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					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,

				.mac_cap_info[5] =

					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,

				.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,

					IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD,

				.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_NDP_4x_LTF_AND_3_2US,

				.phy_cap_info[3] =

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM |

					IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,

				.phy_cap_info[4] =

					IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |
@@ -637,12 +624,8 @@ 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_NG16_SU_FEEDBACK |

					IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK,

					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,

				.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 |
@@ -652,10 +635,11 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
					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,

					IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_2x996,

				.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,

					IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB |

					IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED,

			},

			/*

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

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

+40 −0
Original line number Diff line number Diff line
@@ -2062,6 +2062,46 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm, 
		}



		flags |= STA_CTXT_HE_PACKET_EXT;

	} else if ((sta->he_cap.he_cap_elem.phy_cap_info[9] &

		    IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) !=

		  IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED) {

		int low_th = -1;

		int high_th = -1;



		/* Take the PPE thresholds from the nominal padding info */

		switch (sta->he_cap.he_cap_elem.phy_cap_info[9] &

			IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK) {

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US:

			low_th = IWL_HE_PKT_EXT_NONE;

			high_th = IWL_HE_PKT_EXT_NONE;

			break;

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US:

			low_th = IWL_HE_PKT_EXT_BPSK;

			high_th = IWL_HE_PKT_EXT_NONE;

			break;

		case IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US:

			low_th = IWL_HE_PKT_EXT_NONE;

			high_th = IWL_HE_PKT_EXT_BPSK;

			break;

		}



		/* Set the PPE thresholds accordingly */

		if (low_th >= 0 && high_th >= 0) {

			u8 ***pkt_ext_qam =

				(void *)sta_ctxt_cmd.pkt_ext.pkt_ext_qam_th;



			for (i = 0; i < MAX_HE_SUPP_NSS; i++) {

				u8 bw;



				for (bw = 0; bw < MAX_HE_CHANNEL_BW_INDX;

				     bw++) {

					pkt_ext_qam[i][bw][0] = low_th;

					pkt_ext_qam[i][bw][1] = high_th;

				}

			}



			flags |= STA_CTXT_HE_PACKET_EXT;

		}

	}

	rcu_read_unlock();

include/linux/ieee80211.h

+101 −12
Original line number Diff line number Diff line
@@ -1554,7 +1554,7 @@ 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_D3.0 section 9.4.2.237.2 and 9.4.2.237.3

 * described in P802.11ax_D4.0 section 9.4.2.242.2 and 9.4.2.242.3

 */

struct ieee80211_he_cap_elem {

	u8 mac_cap_info[6];
@@ -1616,12 +1616,12 @@ 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_D3.0 section 9.4.2.238

 * described in P802.11ax_D4.0 section 9.4.2.243

 */

struct ieee80211_he_operation {

	__le32 he_oper_params;

	__le16 he_mcs_nss_set;

	/* Optional 0,1,3 or 4 bytes: depends on @he_oper_params */

	/* Optional 0,1,3,4,5,7 or 8 bytes: depends on @he_oper_params */

	u8 optional[0];

} __packed;
@@ -1629,7 +1629,7 @@ struct ieee80211_he_operation { 
 * struct ieee80211_he_mu_edca_param_ac_rec - MU AC Parameter Record field

 *

 * This structure is the "MU AC Parameter Record" fields as

 * described in P802.11ax_D2.0 section 9.4.2.240

 * described in P802.11ax_D4.0 section 9.4.2.245

 */

struct ieee80211_he_mu_edca_param_ac_rec {

	u8 aifsn;
@@ -1641,7 +1641,7 @@ struct ieee80211_he_mu_edca_param_ac_rec { 
 * struct ieee80211_mu_edca_param_set - MU EDCA Parameter Set element

 *

 * This structure is the "MU EDCA Parameter Set element" fields as

 * described in P802.11ax_D2.0 section 9.4.2.240

 * described in P802.11ax_D4.0 section 9.4.2.245

 */

struct ieee80211_mu_edca_param_set {

	u8 mu_qos_info;
@@ -1778,6 +1778,9 @@ struct ieee80211_mu_edca_param_set { 
#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

#define IEEE80211_HE_MAC_CAP5_HE_DYNAMIC_SM_PS			0x20

#define IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING		0x40

#define IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX		0x80



/* 802.11ax HE PHY capabilities */

#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G		0x02
@@ -1901,11 +1904,11 @@ struct ieee80211_mu_edca_param_set { 
#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_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_CAP8_DCM_MAX_RU_242				0x00

#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_484				0x40

#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_996				0x80

#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_2x996				0xc0

#define IEEE80211_HE_PHY_CAP8_DCM_MAX_RU_MASK				0xc0



#define IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM		0x01

#define IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK		0x02
@@ -1913,6 +1916,11 @@ struct ieee80211_mu_edca_param_set { 
#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

#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_0US			0x00

#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_8US			0x40

#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_16US			0x80

#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_RESERVED		0xc0

#define IEEE80211_HE_PHY_CAP9_NOMIMAL_PKT_PADDING_MASK			0xc0



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

#define IEEE80211_TX_RX_MCS_NSS_SUPP_HIGHEST_MCS_POS			(3)
@@ -1991,13 +1999,36 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) 
#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_CO_HOSTED_BSS			0x00008000

#define IEEE80211_HE_OPERATION_ER_SU_DISABLE			0x00010000

#define IEEE80211_HE_OPERATION_6GHZ_OP_INFO			0x00020000

#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_6ghz_oper - HE 6 GHz operation Information field

 * @primary: primary channel

 * @control: control flags

 * @ccfs0: channel center frequency segment 0

 * @ccfs1: channel center frequency segment 1

 * @minrate: minimum rate (in 1 Mbps units)

 */

struct ieee80211_he_6ghz_oper {

	u8 primary;

#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH	0x3

#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_20MHZ	0

#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_40MHZ	1

#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_80MHZ	2

#define		IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_160MHZ	3

#define IEEE80211_HE_6GHZ_OPER_CTRL_DUP_BEACON	0x4

	u8 control;

	u8 ccfs0;

	u8 ccfs1;

	u8 minrate;

} __packed;



/*

 * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size

 * @he_oper_ie: byte data of the He Operations IE, stating from the the byte
@@ -2021,8 +2052,10 @@ 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_CO_LOCATED_BSS)

	if (he_oper_params & IEEE80211_HE_OPERATION_CO_HOSTED_BSS)

		oper_len++;

	if (he_oper_params & IEEE80211_HE_OPERATION_6GHZ_OP_INFO)

		oper_len += sizeof(struct ieee80211_he_6ghz_oper);



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

	oper_len++;
@@ -2030,6 +2063,34 @@ ieee80211_he_oper_size(const u8 *he_oper_ie) 
	return oper_len;

}



/**

 * ieee80211_he_6ghz_oper - obtain 6 GHz operation field

 * @he_oper: HE operation element (must be pre-validated for size)

 *     but may be %NULL

 *

 * Return: a pointer to the 6 GHz operation field, or %NULL

 */

static inline const struct ieee80211_he_6ghz_oper *

ieee80211_he_6ghz_oper(const struct ieee80211_he_operation *he_oper)

{

	const u8 *ret = (void *)&he_oper->optional;

	u32 he_oper_params;



	if (!he_oper)

		return NULL;



	he_oper_params = le32_to_cpu(he_oper->he_oper_params);



	if (!(he_oper_params & IEEE80211_HE_OPERATION_6GHZ_OP_INFO))

		return NULL;

	if (he_oper_params & IEEE80211_HE_OPERATION_VHT_OPER_INFO)

		ret += 3;

	if (he_oper_params & IEEE80211_HE_OPERATION_CO_HOSTED_BSS)

		ret++;



	return (void *)ret;

}



/* Authentication algorithms */

#define WLAN_AUTH_OPEN 0

#define WLAN_AUTH_SHARED_KEY 1
@@ -2450,6 +2511,16 @@ enum ieee80211_eid_ext { 
	WLAN_EID_EXT_HE_OPERATION = 36,

	WLAN_EID_EXT_UORA = 37,

	WLAN_EID_EXT_HE_MU_EDCA = 38,

	WLAN_EID_EXT_NDP_FEEDBACK_REPORT_PARAMSET = 41,

	WLAN_EID_EXT_BSS_COLOR_CHG_ANN = 42,

	WLAN_EID_EXT_QUIET_TIME_PERIOD_SETUP = 43,

	WLAN_EID_EXT_ESS_REPORT = 45,

	WLAN_EID_EXT_OPS = 46,

	WLAN_EID_EXT_HE_BSS_LOAD = 47,

	WLAN_EID_EXT_KNOWN_BSSID = 57,

	WLAN_EID_EXT_SHORT_SSID_LIST = 58,

	WLAN_EID_EXT_HE_6GHZ_CAPA = 59,

	WLAN_EID_EXT_UL_MU_POWER_CAPA = 60,

};



/* Action category code */
@@ -2943,6 +3014,24 @@ struct ieee80211_tspec_ie { 
	__le16 medium_time;

} __packed;



struct ieee80211_he_6ghz_capa {

	/* uses IEEE80211_HE_6GHZ_CAP_* below */

	__le16 capa;

} __packed;



/* HE 6 GHz band capabilities */

/* uses enum ieee80211_min_mpdu_spacing values */

#define IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START	0x0007

/* uses enum ieee80211_vht_max_ampdu_length_exp values */

#define IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP	0x0038

/* uses IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_* values */

#define IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN	0x00c0

/* WLAN_HT_CAP_SM_PS_* values */

#define IEEE80211_HE_6GHZ_CAP_SM_PS		0x0600

#define IEEE80211_HE_6GHZ_CAP_RD_RESPONDER	0x0800

#define IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS	0x1000

#define IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS	0x2000



/**

 * ieee80211_get_qos_ctl - get pointer to qos control bytes

 * @hdr: the frame

include/net/cfg80211.h

+20 −0
Original line number Diff line number Diff line
@@ -346,10 +346,13 @@ struct ieee80211_sta_he_cap { 
 *

 * @types_mask: interface types mask

 * @he_cap: holds the HE capabilities

 * @he_6ghz_capa: HE 6 GHz capabilities, must be filled in for a

 *	6 GHz band channel (and 0 may be valid value).

 */

struct ieee80211_sband_iftype_data {

	u16 types_mask;

	struct ieee80211_sta_he_cap he_cap;

	struct ieee80211_he_6ghz_capa he_6ghz_capa;

};



/**
@@ -1110,6 +1113,7 @@ enum station_parameters_apply_mask { 
 * @support_p2p_ps: information if station supports P2P PS mechanism

 * @he_capa: HE capabilities of station

 * @he_capa_len: the length of the HE capabilities

 * @he_6ghz_capa: HE 6 GHz Band capabilities of station

 */

struct station_parameters {

	const u8 *supported_rates;
@@ -1139,6 +1143,7 @@ struct station_parameters { 
	int support_p2p_ps;

	const struct ieee80211_he_cap_elem *he_capa;

	u8 he_capa_len;

	const struct ieee80211_he_6ghz_capa *he_6ghz_capa;

};



/**
@@ -4734,6 +4739,21 @@ ieee80211_get_channel(struct wiphy *wiphy, int freq) 
	return ieee80211_get_channel_khz(wiphy, MHZ_TO_KHZ(freq));

}



/**

 * cfg80211_channel_is_psc - Check if the channel is a 6 GHz PSC

 * @chan: control channel to check

 *

 * The Preferred Scanning Channels (PSC) are defined in

 * Draft IEEE P802.11ax/D5.0, 26.17.2.3.3

 */

static inline bool cfg80211_channel_is_psc(struct ieee80211_channel *chan)

{

	if (chan->band != NL80211_BAND_6GHZ)

		return false;



	return ieee80211_frequency_to_channel(chan->center_freq) % 16 == 5;

}



/**

 * ieee80211_get_response_rate - get basic rate for a given rate

 *