Commit 1079a34c authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2020-05-31' of... 

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



Johannes Berg says:

====================
Another set of changes, including
 * many 6 GHz changes, though it's not _quite_ complete
   (I left out scanning for now, we're still discussing)
 * allow userspace SA-query processing for operating channel
   validation
 * TX status for control port TX, for AP-side operation
 * more per-STA/TID control options
 * move to kHz for channels, for future S1G operation
 * various other small changes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 39884604 093a48d2

drivers/net/wireless/mac80211_hwsim.c

+1 −0
Original line number Diff line number Diff line
@@ -3054,6 +3054,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
	hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |

			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |

			    WIPHY_FLAG_AP_UAPSD |

			    WIPHY_FLAG_SUPPORTS_5_10_MHZ |

			    WIPHY_FLAG_HAS_CHANNEL_SWITCH;

	hw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR |

			       NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |

include/linux/ieee80211.h

+339 −5
Original line number Diff line number Diff line
@@ -105,6 +105,51 @@ 


/* extension, added by 802.11ad */

#define IEEE80211_STYPE_DMG_BEACON		0x0000

#define IEEE80211_STYPE_S1G_BEACON		0x0010



/* bits unique to S1G beacon */

#define IEEE80211_S1G_BCN_NEXT_TBTT	0x100



/* see 802.11ah-2016 9.9 NDP CMAC frames */

#define IEEE80211_S1G_1MHZ_NDP_BITS	25

#define IEEE80211_S1G_1MHZ_NDP_BYTES	4

#define IEEE80211_S1G_2MHZ_NDP_BITS	37

#define IEEE80211_S1G_2MHZ_NDP_BYTES	5



#define IEEE80211_NDP_FTYPE_CTS			0

#define IEEE80211_NDP_FTYPE_CF_END		0

#define IEEE80211_NDP_FTYPE_PS_POLL		1

#define IEEE80211_NDP_FTYPE_ACK			2

#define IEEE80211_NDP_FTYPE_PS_POLL_ACK		3

#define IEEE80211_NDP_FTYPE_BA			4

#define IEEE80211_NDP_FTYPE_BF_REPORT_POLL	5

#define IEEE80211_NDP_FTYPE_PAGING		6

#define IEEE80211_NDP_FTYPE_PREQ		7



#define SM64(f, v)	((((u64)v) << f##_S) & f)



/* NDP CMAC frame fields */

#define IEEE80211_NDP_FTYPE                    0x0000000000000007

#define IEEE80211_NDP_FTYPE_S                  0x0000000000000000



/* 1M Probe Request 11ah 9.9.3.1.1 */

#define IEEE80211_NDP_1M_PREQ_ANO      0x0000000000000008

#define IEEE80211_NDP_1M_PREQ_ANO_S                     3

#define IEEE80211_NDP_1M_PREQ_CSSID    0x00000000000FFFF0

#define IEEE80211_NDP_1M_PREQ_CSSID_S                   4

#define IEEE80211_NDP_1M_PREQ_RTYPE    0x0000000000100000

#define IEEE80211_NDP_1M_PREQ_RTYPE_S                  20

#define IEEE80211_NDP_1M_PREQ_RSV      0x0000000001E00000

#define IEEE80211_NDP_1M_PREQ_RSV      0x0000000001E00000

/* 2M Probe Request 11ah 9.9.3.1.2 */

#define IEEE80211_NDP_2M_PREQ_ANO      0x0000000000000008

#define IEEE80211_NDP_2M_PREQ_ANO_S                     3

#define IEEE80211_NDP_2M_PREQ_CSSID    0x0000000FFFFFFFF0

#define IEEE80211_NDP_2M_PREQ_CSSID_S                   4

#define IEEE80211_NDP_2M_PREQ_RTYPE    0x0000001000000000

#define IEEE80211_NDP_2M_PREQ_RTYPE_S                  36



#define IEEE80211_ANO_NETTYPE_WILD              15



/* control extension - for IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTL_EXT */

#define IEEE80211_CTL_EXT_POLL		0x2000
@@ -121,6 +166,21 @@ 
#define IEEE80211_MAX_SN		IEEE80211_SN_MASK

#define IEEE80211_SN_MODULO		(IEEE80211_MAX_SN + 1)





/* PV1 Layout 11ah 9.8.3.1 */

#define IEEE80211_PV1_FCTL_VERS		0x0003

#define IEEE80211_PV1_FCTL_FTYPE	0x001c

#define IEEE80211_PV1_FCTL_STYPE	0x00e0

#define IEEE80211_PV1_FCTL_TODS		0x0100

#define IEEE80211_PV1_FCTL_MOREFRAGS	0x0200

#define IEEE80211_PV1_FCTL_PM		0x0400

#define IEEE80211_PV1_FCTL_MOREDATA	0x0800

#define IEEE80211_PV1_FCTL_PROTECTED	0x1000

#define IEEE80211_PV1_FCTL_END_SP       0x2000

#define IEEE80211_PV1_FCTL_RELAYED      0x4000

#define IEEE80211_PV1_FCTL_ACK_POLICY   0x8000

#define IEEE80211_PV1_FCTL_CTL_EXT	0x0f00



static inline bool ieee80211_sn_less(u16 sn1, u16 sn2)

{

	return ((sn1 - sn2) & IEEE80211_SN_MASK) > (IEEE80211_SN_MODULO >> 1);
@@ -148,6 +208,7 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2) 
#define IEEE80211_MAX_FRAG_THRESHOLD	2352

#define IEEE80211_MAX_RTS_THRESHOLD	2353

#define IEEE80211_MAX_AID		2007

#define IEEE80211_MAX_AID_S1G		8191

#define IEEE80211_MAX_TIM_LEN		251

#define IEEE80211_MAX_MESH_PEERINGS	63

/* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
@@ -371,6 +432,17 @@ static inline bool ieee80211_is_data(__le16 fc) 
	       cpu_to_le16(IEEE80211_FTYPE_DATA);

}



/**

 * ieee80211_is_ext - check if type is IEEE80211_FTYPE_EXT

 * @fc: frame control bytes in little-endian byteorder

 */

static inline bool ieee80211_is_ext(__le16 fc)

{

	return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE)) ==

	       cpu_to_le16(IEEE80211_FTYPE_EXT);

}





/**

 * ieee80211_is_data_qos - check if type is IEEE80211_FTYPE_DATA and IEEE80211_STYPE_QOS_DATA is set

 * @fc: frame control bytes in little-endian byteorder
@@ -469,6 +541,18 @@ static inline bool ieee80211_is_beacon(__le16 fc) 
	       cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON);

}



/**

 * ieee80211_is_s1g_beacon - check if IEEE80211_FTYPE_EXT &&

 * IEEE80211_STYPE_S1G_BEACON

 * @fc: frame control bytes in little-endian byteorder

 */

static inline bool ieee80211_is_s1g_beacon(__le16 fc)

{

	return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE |

				 IEEE80211_FCTL_STYPE)) ==

	       cpu_to_le16(IEEE80211_FTYPE_EXT | IEEE80211_STYPE_S1G_BEACON);

}



/**

 * ieee80211_is_atim - check if IEEE80211_FTYPE_MGMT && IEEE80211_STYPE_ATIM

 * @fc: frame control bytes in little-endian byteorder
@@ -716,7 +800,7 @@ struct ieee80211_msrment_ie { 
	u8 token;

	u8 mode;

	u8 type;

	u8 request[0];

	u8 request[];

} __packed;



/**
@@ -900,6 +984,59 @@ struct ieee80211_addba_ext_ie { 
	u8 data;

} __packed;



/**

 * struct ieee80211_s1g_bcn_compat_ie

 *

 * S1G Beacon Compatibility element

 */

struct ieee80211_s1g_bcn_compat_ie {

	__le16 compat_info;

	__le16 beacon_int;

	__le32 tsf_completion;

} __packed;



/**

 * struct ieee80211_s1g_oper_ie

 *

 * S1G Operation element

 */

struct ieee80211_s1g_oper_ie {

	u8 ch_width;

	u8 oper_class;

	u8 primary_ch;

	u8 oper_ch;

	__le16 basic_mcs_nss;

} __packed;



/**

 * struct ieee80211_aid_response_ie

 *

 * AID Response element

 */

struct ieee80211_aid_response_ie {

	__le16 aid;

	u8 switch_count;

	__le16 response_int;

} __packed;



struct ieee80211_s1g_cap {

	u8 capab_info[10];

	u8 supp_mcs_nss[5];

} __packed;



struct ieee80211_ext {

	__le16 frame_control;

	__le16 duration;

	union {

		struct {

			u8 sa[ETH_ALEN];

			__le32 timestamp;

			u8 change_seq;

			u8 variable[0];

		} __packed s1g_beacon;

	} u;

} __packed __aligned(2);



struct ieee80211_mgmt {

	__le16 frame_control;

	__le16 duration;
@@ -1644,7 +1781,7 @@ struct ieee80211_he_operation { 
	__le32 he_oper_params;

	__le16 he_mcs_nss_set;

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

	u8 optional[0];

	u8 optional[];

} __packed;



/**
@@ -1656,7 +1793,7 @@ struct ieee80211_he_operation { 
struct ieee80211_he_spr {

	u8 he_sr_control;

	/* Optional 0 to 19 bytes: depends on @he_sr_control */

	u8 optional[0];

	u8 optional[];

} __packed;



/**
@@ -1821,6 +1958,8 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap, 
#define IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED			0x40

#define IEEE80211_HE_MAC_CAP3_RX_CTRL_FRAME_TO_MULTIBSS		0x80



#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_SHIFT		3



#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
@@ -1842,6 +1981,9 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap, 
#define IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING		0x40

#define IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX		0x80



#define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR	20

#define IEEE80211_HE_HT_MAX_AMPDU_FACTOR	16



/* 802.11ax HE PHY capabilities */

#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
@@ -2067,6 +2209,28 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) 
#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 byte
@@ -2093,7 +2257,7 @@ ieee80211_he_oper_size(const u8 *he_oper_ie) 
	if (he_oper_params & IEEE80211_HE_OPERATION_CO_HOSTED_BSS)

		oper_len++;

	if (he_oper_params & IEEE80211_HE_OPERATION_6GHZ_OP_INFO)

		oper_len += 4;

		oper_len += sizeof(struct ieee80211_he_6ghz_oper);



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

	oper_len++;
@@ -2101,6 +2265,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;

}



/* HE Spatial Reuse defines */

#define IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT			0x4

#define IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT		0x8
@@ -2137,6 +2329,86 @@ ieee80211_he_spr_size(const u8 *he_spr_ie) 
	return spr_len;

}



/* S1G Capabilities Information field */

#define S1G_CAPAB_B0_S1G_LONG BIT(0)

#define S1G_CAPAB_B0_SGI_1MHZ BIT(1)

#define S1G_CAPAB_B0_SGI_2MHZ BIT(2)

#define S1G_CAPAB_B0_SGI_4MHZ BIT(3)

#define S1G_CAPAB_B0_SGI_8MHZ BIT(4)

#define S1G_CAPAB_B0_SGI_16MHZ BIT(5)

#define S1G_CAPAB_B0_SUPP_CH_WIDTH_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B0_SUPP_CH_WIDTH_SHIFT 6



#define S1G_CAPAB_B1_RX_LDPC BIT(0)

#define S1G_CAPAB_B1_TX_STBC BIT(1)

#define S1G_CAPAB_B1_RX_STBC BIT(2)

#define S1G_CAPAB_B1_SU_BFER BIT(3)

#define S1G_CAPAB_B1_SU_BFEE BIT(4)

#define S1G_CAPAB_B1_BFEE_STS_MASK (BIT(5) | BIT(6) | BIT(7))

#define S1G_CAPAB_B1_BFEE_STS_SHIFT 5



#define S1G_CAPAB_B2_SOUNDING_DIMENSIONS_MASK (BIT(0) | BIT(1) | BIT(2))

#define S1G_CAPAB_B2_SOUNDING_DIMENSIONS_SHIFT 0

#define S1G_CAPAB_B2_MU_BFER BIT(3)

#define S1G_CAPAB_B2_MU_BFEE BIT(4)

#define S1G_CAPAB_B2_PLUS_HTC_VHT BIT(5)

#define S1G_CAPAB_B2_TRAVELING_PILOT_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B2_TRAVELING_PILOT_SHIFT 6



#define S1G_CAPAB_B3_RD_RESPONDER BIT(0)

#define S1G_CAPAB_B3_HT_DELAYED_BA BIT(1)

#define S1G_CAPAB_B3_MAX_MPDU_LEN BIT(2)

#define S1G_CAPAB_B3_MAX_AMPDU_LEN_EXP_MASK (BIT(3) | BIT(4))

#define S1G_CAPAB_B3_MAX_AMPDU_LEN_EXP_SHIFT 3

#define S1G_CAPAB_B3_MIN_MPDU_START_MASK (BIT(5) | BIT(6) | BIT(7))

#define S1G_CAPAB_B3_MIN_MPDU_START_SHIFT 5



#define S1G_CAPAB_B4_UPLINK_SYNC BIT(0)

#define S1G_CAPAB_B4_DYNAMIC_AID BIT(1)

#define S1G_CAPAB_B4_BAT BIT(2)

#define S1G_CAPAB_B4_TIME_ADE BIT(3)

#define S1G_CAPAB_B4_NON_TIM BIT(4)

#define S1G_CAPAB_B4_GROUP_AID BIT(5)

#define S1G_CAPAB_B4_STA_TYPE_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B4_STA_TYPE_SHIFT 6



#define S1G_CAPAB_B5_CENT_AUTH_CONTROL BIT(0)

#define S1G_CAPAB_B5_DIST_AUTH_CONTROL BIT(1)

#define S1G_CAPAB_B5_AMSDU BIT(2)

#define S1G_CAPAB_B5_AMPDU BIT(3)

#define S1G_CAPAB_B5_ASYMMETRIC_BA BIT(4)

#define S1G_CAPAB_B5_FLOW_CONTROL BIT(5)

#define S1G_CAPAB_B5_SECTORIZED_BEAM_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B5_SECTORIZED_BEAM_SHIFT 6



#define S1G_CAPAB_B6_OBSS_MITIGATION BIT(0)

#define S1G_CAPAB_B6_FRAGMENT_BA BIT(1)

#define S1G_CAPAB_B6_NDP_PS_POLL BIT(2)

#define S1G_CAPAB_B6_RAW_OPERATION BIT(3)

#define S1G_CAPAB_B6_PAGE_SLICING BIT(4)

#define S1G_CAPAB_B6_TXOP_SHARING_IMP_ACK BIT(5)

#define S1G_CAPAB_B6_VHT_LINK_ADAPT_MASK (BIT(6) | BIT(7))

#define S1G_CAPAB_B6_VHT_LINK_ADAPT_SHIFT 6



#define S1G_CAPAB_B7_TACK_AS_PS_POLL BIT(0)

#define S1G_CAPAB_B7_DUP_1MHZ BIT(1)

#define S1G_CAPAB_B7_MCS_NEGOTIATION BIT(2)

#define S1G_CAPAB_B7_1MHZ_CTL_RESPONSE_PREAMBLE BIT(3)

#define S1G_CAPAB_B7_NDP_BFING_REPORT_POLL BIT(4)

#define S1G_CAPAB_B7_UNSOLICITED_DYN_AID BIT(5)

#define S1G_CAPAB_B7_SECTOR_TRAINING_OPERATION BIT(6)

#define S1G_CAPAB_B7_TEMP_PS_MODE_SWITCH BIT(7)



#define S1G_CAPAB_B8_TWT_GROUPING BIT(0)

#define S1G_CAPAB_B8_BDT BIT(1)

#define S1G_CAPAB_B8_COLOR_MASK (BIT(2) | BIT(3) | BIT(4))

#define S1G_CAPAB_B8_COLOR_SHIFT 2

#define S1G_CAPAB_B8_TWT_REQUEST BIT(5)

#define S1G_CAPAB_B8_TWT_RESPOND BIT(6)

#define S1G_CAPAB_B8_PV1_FRAME BIT(7)



#define S1G_CAPAB_B9_LINK_ADAPT_PER_CONTROL_RESPONSE BIT(0)



/* Authentication algorithms */

#define WLAN_AUTH_OPEN 0

#define WLAN_AUTH_SHARED_KEY 1
@@ -2532,8 +2804,14 @@ enum ieee80211_eid { 
	WLAN_EID_QUIET_CHANNEL = 198,

	WLAN_EID_OPMODE_NOTIF = 199,



	WLAN_EID_REDUCED_NEIGHBOR_REPORT = 201,



	WLAN_EID_S1G_BCN_COMPAT = 213,

	WLAN_EID_S1G_SHORT_BCN_INTERVAL = 214,

	WLAN_EID_S1G_CAPABILITIES = 217,

	WLAN_EID_VENDOR_SPECIFIC = 221,

	WLAN_EID_QOS_PARAMETER = 222,

	WLAN_EID_S1G_OPERATION = 232,

	WLAN_EID_CAG_NUMBER = 237,

	WLAN_EID_AP_CSN = 239,

	WLAN_EID_FILS_INDICATION = 240,
@@ -2561,9 +2839,19 @@ enum ieee80211_eid_ext { 
	WLAN_EID_EXT_UORA = 37,

	WLAN_EID_EXT_HE_MU_EDCA = 38,

	WLAN_EID_EXT_HE_SPR = 39,

	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_MAX_CHANNEL_SWITCH_TIME = 52,

	WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55,

	WLAN_EID_EXT_NON_INHERITANCE = 56,

	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 */
@@ -2794,7 +3082,7 @@ enum ieee80211_tdls_actioncode { 
#define WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT BIT(7)



/* Defines support for enhanced multi-bssid advertisement*/

#define WLAN_EXT_CAPA11_EMA_SUPPORT	BIT(1)

#define WLAN_EXT_CAPA11_EMA_SUPPORT	BIT(3)



/* TDLS specific payload type in the LLC/SNAP header */

#define WLAN_TDLS_SNAP_RFTYPE	0x2
@@ -3106,6 +3394,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
@@ -3333,6 +3639,8 @@ static inline int ieee80211_get_tdls_action(struct sk_buff *skb, u32 hdr_size) 
/* convert frequencies */

#define MHZ_TO_KHZ(freq) ((freq) * 1000)

#define KHZ_TO_MHZ(freq) ((freq) / 1000)

#define PR_KHZ(f) KHZ_TO_MHZ(f), f % 1000

#define KHZ_F "%d.%03d"



/* convert powers */

#define DBI_TO_MBI(gain) ((gain) * 100)
@@ -3447,4 +3755,30 @@ static inline bool for_each_element_completed(const struct element *element, 
#define WLAN_RSNX_CAPA_PROTECTED_TWT BIT(4)

#define WLAN_RSNX_CAPA_SAE_H2E BIT(5)



/*

 * reduced neighbor report, based on Draft P802.11ax_D5.0,

 * section 9.4.2.170

 */

#define IEEE80211_AP_INFO_TBTT_HDR_TYPE				0x03

#define IEEE80211_AP_INFO_TBTT_HDR_FILTERED			0x04

#define IEEE80211_AP_INFO_TBTT_HDR_COLOC			0x08

#define IEEE80211_AP_INFO_TBTT_HDR_COUNT			0xF0

#define IEEE80211_TBTT_INFO_OFFSET_BSSID_BSS_PARAM		8

#define IEEE80211_TBTT_INFO_OFFSET_BSSID_SSSID_BSS_PARAM	12



#define IEEE80211_RNR_TBTT_PARAMS_OCT_RECOMMENDED		0x01

#define IEEE80211_RNR_TBTT_PARAMS_SAME_SSID			0x02

#define IEEE80211_RNR_TBTT_PARAMS_MULTI_BSSID			0x04

#define IEEE80211_RNR_TBTT_PARAMS_TRANSMITTED_BSSID		0x08

#define IEEE80211_RNR_TBTT_PARAMS_COLOC_ESS			0x10

#define IEEE80211_RNR_TBTT_PARAMS_PROBE_ACTIVE			0x20

#define IEEE80211_RNR_TBTT_PARAMS_COLOC_AP			0x40



struct ieee80211_neighbor_ap_info {

       u8 tbtt_info_hdr;

       u8 tbtt_info_len;

       u8 op_class;

       u8 channel;

} __packed;



#endif /* LINUX_IEEE80211_H */

include/net/cfg80211.h

+142 −27
Original line number Diff line number Diff line
@@ -354,10 +354,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;

};



/**
@@ -509,6 +512,26 @@ ieee80211_get_he_sta_cap(const struct ieee80211_supported_band *sband) 
	return ieee80211_get_he_iftype_cap(sband, NL80211_IFTYPE_STATION);

}



/**

 * ieee80211_get_he_6ghz_capa - return HE 6 GHz capabilities

 * @sband: the sband to search for the STA on

 * @iftype: the iftype to search for

 *

 * Return: the 6GHz capabilities

 */

static inline __le16

ieee80211_get_he_6ghz_capa(const struct ieee80211_supported_band *sband,

			   enum nl80211_iftype iftype)

{

	const struct ieee80211_sband_iftype_data *data =

		ieee80211_get_sband_iftype_data(sband, iftype);



	if (WARN_ON(!data || !data->he_cap.has_he))

		return 0;



	return data->he_6ghz_capa.capa;

}



/**

 * wiphy_read_of_freq_limits - read frequency limits from device tree

 *
@@ -630,6 +653,19 @@ struct cfg80211_chan_def { 
	u16 freq1_offset;

};



/*

 * cfg80211_bitrate_mask - masks for bitrate control

 */

struct cfg80211_bitrate_mask {

	struct {

		u32 legacy;

		u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN];

		u16 vht_mcs[NL80211_VHT_NSS_MAX];

		enum nl80211_txrate_gi gi;

	} control[NUM_NL80211_BANDS];

};





/**

 * struct cfg80211_tid_cfg - TID specific configuration

 * @config_override: Flag to notify driver to reset TID configuration
@@ -640,17 +676,23 @@ struct cfg80211_chan_def { 
 * @noack: noack configuration value for the TID

 * @retry_long: retry count value

 * @retry_short: retry count value

 * @ampdu: Enable/Disable aggregation

 * @ampdu: Enable/Disable MPDU aggregation

 * @rtscts: Enable/Disable RTS/CTS

 * @amsdu: Enable/Disable MSDU aggregation

 * @txrate_type: Tx bitrate mask type

 * @txrate_mask: Tx bitrate to be applied for the TID

 */

struct cfg80211_tid_cfg {

	bool config_override;

	u8 tids;

	u32 mask;

	u64 mask;

	enum nl80211_tid_config noack;

	u8 retry_long, retry_short;

	enum nl80211_tid_config ampdu;

	enum nl80211_tid_config rtscts;

	enum nl80211_tid_config amsdu;

	enum nl80211_tx_rate_setting txrate_type;

	struct cfg80211_bitrate_mask txrate_mask;

};



/**
@@ -1005,18 +1047,6 @@ struct cfg80211_acl_data { 
	struct mac_address mac_addrs[];

};



/*

 * cfg80211_bitrate_mask - masks for bitrate control

 */

struct cfg80211_bitrate_mask {

	struct {

		u32 legacy;

		u8 ht_mcs[IEEE80211_HT_MCS_MASK_LEN];

		u16 vht_mcs[NL80211_VHT_NSS_MAX];

		enum nl80211_txrate_gi gi;

	} control[NUM_NL80211_BANDS];

};



/**

 * enum cfg80211_ap_settings_flags - AP settings flags

 *
@@ -1231,6 +1261,7 @@ struct sta_txpwr { 
 * @he_capa_len: the length of the HE capabilities

 * @airtime_weight: airtime scheduler weight for this station

 * @txpwr: transmit power for an associated station

 * @he_6ghz_capa: HE 6 GHz Band capabilities of station

 */

struct station_parameters {

	const u8 *supported_rates;
@@ -1263,6 +1294,7 @@ struct station_parameters { 
	u8 he_capa_len;

	u16 airtime_weight;

	struct sta_txpwr txpwr;

	const struct ieee80211_he_6ghz_capa *he_6ghz_capa;

};



/**
@@ -2035,7 +2067,7 @@ struct cfg80211_scan_request { 
	bool no_cck;



	/* keep last */

	struct ieee80211_channel *channels[0];

	struct ieee80211_channel *channels[];

};



static inline void get_random_mask_addr(u8 *buf, const u8 *addr, const u8 *mask)
@@ -2181,7 +2213,7 @@ struct cfg80211_sched_scan_request { 
	struct list_head list;



	/* keep last */

	struct ieee80211_channel *channels[0];

	struct ieee80211_channel *channels[];

};



/**
@@ -2303,7 +2335,7 @@ struct cfg80211_bss { 
	u8 bssid_index;

	u8 max_bssid_indicator;



	u8 priv[0] __aligned(sizeof(void *));

	u8 priv[] __aligned(sizeof(void *));

};



/**
@@ -2904,12 +2936,17 @@ struct cfg80211_wowlan_wakeup { 


/**

 * struct cfg80211_gtk_rekey_data - rekey data

 * @kek: key encryption key (NL80211_KEK_LEN bytes)

 * @kck: key confirmation key (NL80211_KCK_LEN bytes)

 * @kek: key encryption key (@kek_len bytes)

 * @kck: key confirmation key (@kck_len bytes)

 * @replay_ctr: replay counter (NL80211_REPLAY_CTR_LEN bytes)

 * @kek_len: length of kek

 * @kck_len length of kck

 * @akm: akm (oui, id)

 */

struct cfg80211_gtk_rekey_data {

	const u8 *kek, *kck, *replay_ctr;

	u32 akm;

	u8 kek_len, kck_len;

};



/**
@@ -4067,7 +4104,8 @@ struct cfg80211_ops { 
				   struct net_device *dev,

				   const u8 *buf, size_t len,

				   const u8 *dest, const __be16 proto,

				   const bool noencrypt);

				   const bool noencrypt,

				   u64 *cookie);



	int	(*get_ftm_responder_stats)(struct wiphy *wiphy,

				struct net_device *dev,
@@ -4133,9 +4171,10 @@ struct cfg80211_ops { 
 *	beaconing mode (AP, IBSS, Mesh, ...).

 * @WIPHY_FLAG_HAS_STATIC_WEP: The device supports static WEP key installation

 *	before connection.

 * @WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK: The device supports bigger kek and kck keys

 */

enum wiphy_flags {

	/* use hole at 0 */

	WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK		= BIT(0),

	/* use hole at 1 */

	/* use hole at 2 */

	WIPHY_FLAG_NETNS_OK			= BIT(3),
@@ -4850,7 +4889,7 @@ struct wiphy { 


	u8 max_data_retry_count;



	char priv[0] __aligned(NETDEV_ALIGN);

	char priv[] __aligned(NETDEV_ALIGN);

};



static inline struct net *wiphy_net(struct wiphy *wiphy)
@@ -5269,6 +5308,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

 *
@@ -6986,6 +7040,26 @@ void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr, 
			  enum nl80211_connect_failed_reason reason,

			  gfp_t gfp);



/**

 * cfg80211_rx_mgmt_khz - notification of received, unprocessed management frame

 * @wdev: wireless device receiving the frame

 * @freq: Frequency on which the frame was received in KHz

 * @sig_dbm: signal strength in dBm, or 0 if unknown

 * @buf: Management frame (header + body)

 * @len: length of the frame data

 * @flags: flags, as defined in enum nl80211_rxmgmt_flags

 *

 * This function is called whenever an Action frame is received for a station

 * mode interface, but is not processed in kernel.

 *

 * Return: %true if a user space application has registered for this frame.

 * For action frames, that makes it responsible for rejecting unrecognized

 * action frames; %false otherwise, in which case for action frames the

 * driver is responsible for rejecting the frame.

 */

bool cfg80211_rx_mgmt_khz(struct wireless_dev *wdev, int freq, int sig_dbm,

			  const u8 *buf, size_t len, u32 flags);



/**

 * cfg80211_rx_mgmt - notification of received, unprocessed management frame

 * @wdev: wireless device receiving the frame
@@ -7003,8 +7077,13 @@ void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr, 
 * action frames; %false otherwise, in which case for action frames the

 * driver is responsible for rejecting the frame.

 */

bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm,

		      const u8 *buf, size_t len, u32 flags);

static inline bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq,

				    int sig_dbm, const u8 *buf, size_t len,

				    u32 flags)

{

	return cfg80211_rx_mgmt_khz(wdev, MHZ_TO_KHZ(freq), sig_dbm, buf, len,

				    flags);

}



/**

 * cfg80211_mgmt_tx_status - notification of TX status for management frame
@@ -7022,6 +7101,23 @@ bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm, 
void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,

			     const u8 *buf, size_t len, bool ack, gfp_t gfp);



/**

 * cfg80211_control_port_tx_status - notification of TX status for control

 *                                   port frames

 * @wdev: wireless device receiving the frame

 * @cookie: Cookie returned by cfg80211_ops::tx_control_port()

 * @buf: Data frame (header + body)

 * @len: length of the frame data

 * @ack: Whether frame was acknowledged

 * @gfp: context flags

 *

 * This function is called whenever a control port frame was requested to be

 * transmitted with cfg80211_ops::tx_control_port() to report the TX status of

 * the transmission attempt.

 */

void cfg80211_control_port_tx_status(struct wireless_dev *wdev, u64 cookie,

				     const u8 *buf, size_t len, bool ack,

				     gfp_t gfp);



/**

 * cfg80211_rx_control_port - notification about a received control port frame
@@ -7202,6 +7298,21 @@ void cfg80211_probe_status(struct net_device *dev, const u8 *addr, 
			   u64 cookie, bool acked, s32 ack_signal,

			   bool is_valid_ack_signal, gfp_t gfp);



/**

 * cfg80211_report_obss_beacon_khz - report beacon from other APs

 * @wiphy: The wiphy that received the beacon

 * @frame: the frame

 * @len: length of the frame

 * @freq: frequency the frame was received on in KHz

 * @sig_dbm: signal strength in dBm, or 0 if unknown

 *

 * Use this function to report to userspace when a beacon was

 * received. It is not useful to call this when there is no

 * netdev that is in AP/GO mode.

 */

void cfg80211_report_obss_beacon_khz(struct wiphy *wiphy, const u8 *frame,

				     size_t len, int freq, int sig_dbm);



/**

 * cfg80211_report_obss_beacon - report beacon from other APs

 * @wiphy: The wiphy that received the beacon
@@ -7214,9 +7325,13 @@ void cfg80211_probe_status(struct net_device *dev, const u8 *addr, 
 * received. It is not useful to call this when there is no

 * netdev that is in AP/GO mode.

 */

void cfg80211_report_obss_beacon(struct wiphy *wiphy,

static inline void cfg80211_report_obss_beacon(struct wiphy *wiphy,

					       const u8 *frame, size_t len,

				 int freq, int sig_dbm);

					       int freq, int sig_dbm)

{

	cfg80211_report_obss_beacon_khz(wiphy, frame, len, MHZ_TO_KHZ(freq),

					sig_dbm);

}



/**

 * cfg80211_reg_can_beacon - check if beaconing is allowed

include/net/mac80211.h

+8 −6

File changed.

Preview size limit exceeded, changes collapsed.

include/uapi/linux/nl80211.h

+100 −26

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE