@zigc/lib 0.17.0-dev.44 → 0.17.0-dev.607

package/libc/include/generic-openbsd/net/pfvar_priv.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfvar_priv.h,v 1.38 2024/09/07 22:41:55 aisha Exp $	*/
+/*	$OpenBSD: pfvar_priv.h,v 1.42 2026/02/05 03:26:00 dlg Exp $	*/
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -39,6 +39,7 @@
 
 #include <sys/rwlock.h>
 #include <sys/mutex.h>
+#include <sys/pclock.h>
 #include <sys/percpu.h>
 
 /*
@@ -47,6 +48,45 @@
  */
 
 struct pfsync_deferral;
+struct kstat;
+
+/*
+ * PF state links
+ *
+ * This is used to augment a struct pf_state so it can be
+ * tracked/referenced by the state and source address limiter things.
+ * Each limiter maintains a list of the states they "own", and these
+ * state links are what the limiters use to wire a state into their
+ * lists.
+ *
+ * Without PF state links, the pf_state struct would have to grow
+ * a lot to support a feature that may not be used.
+ *
+ * pfl_entry is used by the pools to add states to their list.
+ * pfl_state allows the pools to get from their list of states to
+ * the states themselves.
+ *
+ * pfl_link allows operations on states (well, delete) to be able
+ * to quickly locate the pf_state_link struct so they can be unwired
+ * from the pools.
+ */
+
+#define PF_STATE_LINK_TYPE_STATELIM	1
+#define PF_STATE_LINK_TYPE_SOURCELIM	2
+
+struct pf_state_link {
+	/* used by source/state pools to get to states */
+	TAILQ_ENTRY(pf_state_link)	 pfl_link;
+
+	/* used by pf_state to get to source/state pools */
+	SLIST_ENTRY(pf_state_link)	 pfl_linkage;
+
+	struct pf_state			*pfl_state;
+	unsigned int			 pfl_type;
+};
+
+TAILQ_HEAD(pf_state_link_list, pf_state_link);
+SLIST_HEAD(pf_state_linkage, pf_state_link);
 
 /*
  * pf state items - links from pf_state_key to pf_states
@@ -144,6 +184,9 @@ struct pf_state {
 	u_int16_t		 if_index_out;	/* [I] */
 	u_int16_t		 delay;		/* [I] */
 	u_int8_t		 rt;		/* [I] */
+	uint8_t			 statelim;
+	uint8_t			 sourcelim;
+	struct pf_state_linkage	 linkage;
 };
 
 RBT_HEAD(pf_state_tree_id, pf_state);
@@ -256,6 +299,214 @@ struct pf_state_list {
 	.pfs_rwl	= RWLOCK_INITIALIZER("pfstates"),		\
 }
 
+/*
+ * State limiter
+ */
+
+struct pf_statelim {
+	RBT_ENTRY(pf_statelim)		 pfstlim_id_tree;
+	RBT_ENTRY(pf_statelim)		 pfstlim_nm_tree;
+	TAILQ_ENTRY(pf_statelim)	 pfstlim_list;
+	struct kstat			*pfstlim_ks;
+
+	uint32_t			 pfstlim_id;
+	char				 pfstlim_nm[PF_STATELIM_NAME_LEN];
+
+	/* config */
+
+	unsigned int			 pfstlim_limit;
+	struct {
+		unsigned int			limit;
+		unsigned int			seconds;
+	}				 pfstlim_rate;
+
+	/* run state */
+	struct pc_lock			 pfstlim_lock;
+
+	/* rate limiter */
+	uint64_t			 pfstlim_rate_ts;
+	uint64_t			 pfstlim_rate_token;
+	uint64_t			 pfstlim_rate_bucket;
+
+	unsigned int			 pfstlim_inuse;
+	struct pf_state_link_list	 pfstlim_states;
+
+	/* counters */
+
+	struct {
+		uint64_t			admitted;
+		uint64_t			hardlimited;
+		uint64_t			ratelimited;
+	}				 pfstlim_counters;
+
+	struct {
+		time_t				created;
+		time_t				updated;
+		time_t				cleared;
+	}				 pfstlim_timestamps;
+};
+
+RBT_HEAD(pf_statelim_id_tree, pf_statelim);
+RBT_PROTOTYPE(pf_statelim_id_tree, pf_statelim, pfstlim_id_tree, cmp);
+
+RBT_HEAD(pf_statelim_nm_tree, pf_statelim);
+RBT_PROTOTYPE(pf_statelim_nm_tree, pf_statelim, pfstlim_nm_tree, cmp);
+
+TAILQ_HEAD(pf_statelim_list, pf_statelim);
+
+extern struct pf_statelim_id_tree pf_statelim_id_tree_active;
+extern struct pf_statelim_list pf_statelim_list_active;
+
+extern struct pf_statelim_id_tree pf_statelim_id_tree_inactive;
+extern struct pf_statelim_nm_tree pf_statelim_nm_tree_inactive;
+extern struct pf_statelim_list pf_statelim_list_inactive;
+
+static inline unsigned int
+pf_statelim_enter(struct pf_statelim *pfstlim)
+{
+	return (pc_sprod_enter(&pfstlim->pfstlim_lock));
+}
+
+static inline void
+pf_statelim_leave(struct pf_statelim *pfstlim, unsigned int gen)
+{
+	pc_sprod_leave(&pfstlim->pfstlim_lock, gen);
+}
+
+/*
+ * Source address pools
+ */
+
+struct pf_sourcelim;
+
+struct pf_source {
+	RBT_ENTRY(pf_source)		 pfsr_tree;
+	RBT_ENTRY(pf_source)		 pfsr_ioc_tree;
+	struct pf_sourcelim		*pfsr_parent;
+
+	sa_family_t			 pfsr_af;
+	u_int16_t			 pfsr_rdomain;
+	struct pf_addr			 pfsr_addr;
+
+	/* run state */
+
+	unsigned int			 pfsr_inuse;
+	unsigned int			 pfsr_intable;
+	struct pf_state_link_list	 pfsr_states;
+	time_t				 pfsr_empty_ts;
+	TAILQ_ENTRY(pf_source)		 pfsr_empty_gc;
+
+	/* rate limiter */
+	uint64_t			 pfsr_rate_ts;
+
+	struct {
+		uint64_t			admitted;
+		uint64_t			hardlimited;
+		uint64_t			ratelimited;
+	}				 pfsr_counters;
+};
+
+RBT_HEAD(pf_source_tree, pf_source);
+RBT_PROTOTYPE(pf_source_tree, pf_source, pfsr_tree, cmp);
+
+RBT_HEAD(pf_source_ioc_tree, pf_source);
+RBT_PROTOTYPE(pf_source_ioc_tree, pf_source, pfsr_ioc_tree, cmp);
+
+TAILQ_HEAD(pf_source_list, pf_source);
+
+struct pf_sourcelim {
+	RBT_ENTRY(pf_sourcelim)		 pfsrlim_id_tree;
+	RBT_ENTRY(pf_sourcelim)		 pfsrlim_nm_tree;
+	TAILQ_ENTRY(pf_sourcelim)	 pfsrlim_list;
+	struct kstat			*pfsrlim_ks;
+
+	uint32_t			 pfsrlim_id;
+	char				 pfsrlim_nm[PF_SOURCELIM_NAME_LEN];
+	unsigned int			 pfsrlim_disabled;
+
+	/* config */
+
+	unsigned int			 pfsrlim_entries;
+	unsigned int			 pfsrlim_limit;
+	unsigned int			 pfsrlim_ipv4_prefix;
+	unsigned int			 pfsrlim_ipv6_prefix;
+
+	struct {
+		unsigned int			limit;
+		unsigned int			seconds;
+	}				 pfsrlim_rate;
+
+	struct {
+		char				name[PF_TABLE_NAME_SIZE];
+		unsigned int			hwm;
+		unsigned int			lwm;
+	        struct pfr_ktable		*table;
+	}				 pfsrlim_overload;
+
+	/* run state */
+	struct pc_lock			 pfsrlim_lock;
+
+	struct pf_addr			 pfsrlim_ipv4_mask;
+	struct pf_addr			 pfsrlim_ipv6_mask;
+
+	uint64_t			 pfsrlim_rate_token;
+	uint64_t			 pfsrlim_rate_bucket;
+
+	/* number of pf_sources */
+	unsigned int			 pfsrlim_nsources;
+	struct pf_source_tree		 pfsrlim_sources;
+	struct pf_source_ioc_tree	 pfsrlim_ioc_sources;
+
+	struct {
+		/* number of times pf_source was allocated */
+		uint64_t			addrallocs;
+		/* state was rejected because the address limit was hit */
+		uint64_t			addrlimited;
+		/* no memory to create address thing */
+		uint64_t			addrnomem;
+
+		/* sum of pf_source inuse gauges */
+		uint64_t			inuse;
+		/* sum of pf_source admitted counters */
+		uint64_t			admitted;
+		/* sum of pf_source hardlimited counters */
+		uint64_t			hardlimited;
+		/* sum of pf_source ratelimited counters */
+		uint64_t			ratelimited;
+	}				 pfsrlim_counters;
+};
+
+RBT_HEAD(pf_sourcelim_id_tree, pf_sourcelim);
+RBT_PROTOTYPE(pf_sourcelim_id_tree, pf_sourcelim, pfsrlim_id_tree, cmp);
+
+RBT_HEAD(pf_sourcelim_nm_tree, pf_sourcelim);
+RBT_PROTOTYPE(pf_sourcelim_nm_tree, pf_sourcelim, pfsrlim_nm_tree, cmp);
+
+TAILQ_HEAD(pf_sourcelim_list, pf_sourcelim);
+
+extern struct pf_sourcelim_id_tree pf_sourcelim_id_tree_active;
+extern struct pf_sourcelim_list pf_sourcelim_list_active;
+
+extern struct pf_sourcelim_id_tree pf_sourcelim_id_tree_inactive;
+extern struct pf_sourcelim_nm_tree pf_sourcelim_nm_tree_inactive;
+extern struct pf_sourcelim_list pf_sourcelim_list_inactive;
+
+static inline unsigned int
+pf_sourcelim_enter(struct pf_sourcelim *pfsrlim)
+{
+	return (pc_sprod_enter(&pfsrlim->pfsrlim_lock));
+}
+
+static inline void
+pf_sourcelim_leave(struct pf_sourcelim *pfsrlim, unsigned int gen)
+{
+	pc_sprod_leave(&pfsrlim->pfsrlim_lock, gen);
+}
+
+/*
+ * pf internals
+ */
+
 extern struct rwlock pf_lock;
 
 struct pf_pdesc {
@@ -429,6 +680,10 @@ u_int16_t		pf_pkt_hash(sa_family_t, uint8_t,
 			    const struct pf_addr *, const struct pf_addr *,
 			    uint16_t, uint16_t);
 
+void			pf_status_init(void);
+void			pf_status_clear(void);
+void			pf_status_read(struct pf_status *);
+
 #endif /* _KERNEL */
 
 #endif /* _NET_PFVAR_PRIV_H_ */

package/libc/include/generic-openbsd/net80211/ieee80211.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211.h,v 1.64 2025/08/04 11:39:50 stsp Exp $	*/
+/*	$OpenBSD: ieee80211.h,v 1.66 2026/03/29 21:16:21 kirill Exp $	*/
 /*	$NetBSD: ieee80211.h,v 1.6 2004/04/30 23:51:53 dyoung Exp $	*/
 
 /*-
@@ -454,9 +454,16 @@ enum {
 	IEEE80211_ELEMID_QUIET_CHNL		= 198,	/* 11ac */
 	IEEE80211_ELEMID_OPMODE_NOTIF		= 199,	/* 11ac */
 	/* 200-220 reserved */
-	IEEE80211_ELEMID_VENDOR			= 221	/* vendor private */
-	/* 222-255 reserved */
+	IEEE80211_ELEMID_VENDOR			= 221,	/* vendor private */
+	/* 222-254 reserved */
+	IEEE80211_ELEMID_EXTENSION		= 255	/* Extension */
 };
+/*
+ * Extension element IDs
+ * Used with IEEE80211_ELEMID_EXTENSION (255)
+ */
+#define IEEE80211_ELEMID_EXT_HECAPS		35	/* 11ax HE Capabilities */
+#define IEEE80211_ELEMID_EXT_HEOP		36	/* 11ax HE Operation */
 
 /*
  * Action field category values (see 802.11-2012 8.4.1.11 Table 8-38).
@@ -518,6 +525,7 @@ enum {
 
 #define	IEEE80211_HT_NUM_MCS			77
 #define	IEEE80211_VHT_NUM_MCS			10
+#define	IEEE80211_HE_NUM_MCS			12
 
 /*
  * BlockAck/BlockAckReq Control field (see 802.11-2012 8.3.1.9 Figure 8-25).
@@ -712,7 +720,8 @@ enum {
 #define IEEE80211_HTOP1_NONGF_STA	0x0004
 /* Bit 3 is reserved. */
 #define IEEE80211_HTOP1_OBSS_NONHT_STA	0x0010
-/* Bits 5-15 are reserved. */
+#define IEEE80211_HTOP1_CCFS2_SHIFT	5
+#define IEEE80211_HTOP1_CCFS2_MASK	0x1fe0
 /* Bytes 4-5. */
 /* Bits 0-5 are reserved. */
 #define IEEE80211_HTOP2_DUALBEACON	0x0040
@@ -768,6 +777,8 @@ enum {
 #define IEEE80211_VHTCAP_LINK_ADAPT_MRQ_MFB	3
 #define IEEE80211_VHTCAP_RX_ANT_PATTERN		0x10000000
 #define IEEE80211_VHTCAP_TX_ANT_PATTERN		0x20000000
+#define IEEE80211_VHTCAP_EXT_NSS_BW_SHIFT	30
+#define IEEE80211_VHTCAP_EXT_NSS_BW_MASK	0xc0000000
 
 /*
  * VHT-MCS and NSS map (see 802.11ac-2013 8.4.2.160.3, Figure 8-401bs).
@@ -784,6 +795,7 @@ enum {
 
 #define IEEE80211_VHT_MAX_LGI_MBIT_S_MASK	0x1fff
 #define IEEE80211_VHT_MAX_LGI_MBIT_S_SHIFT	0
+#define IEEE80211_VHT_EXT_NSS_BW_CAPABLE	(1 << 13)
 
 /* The highest number of spatial streams supported by VHT. */
 #define IEEE80211_VHT_NUM_SS	8
@@ -801,6 +813,66 @@ enum {
 /* Byte 1 contains channel center frequency index 0 for 80, 80+80, 160 MHz. */
 /* Byte 2 contains channel center frequency index 1 for 80+80 MHz only. */
 
+
+/*
+ * 802.11ax (HE) definitions.
+ */
+
+/* HE Capabilities element fixed fields */
+#define IEEE80211_HE_MAC_CAPS_LEN		6
+#define IEEE80211_HE_PHY_CAPS_LEN		11
+#define IEEE80211_HE_CAPS_FIXED_LEN		(IEEE80211_HE_MAC_CAPS_LEN + \
+						    IEEE80211_HE_PHY_CAPS_LEN)
+
+/* HE Tx/Rx MCS NSS Support field size for 80 MHz */
+#define IEEE80211_HE_MCS_NSS_80_LEN		4
+
+/* Minimum length of the HE Capabilities element body (includes Ext ID) */
+#define IEEE80211_HE_CAPS_MINLEN		(1 + IEEE80211_HE_CAPS_FIXED_LEN + \
+						    IEEE80211_HE_MCS_NSS_80_LEN)
+
+/*
+ * Selected HE PHY capability bits (phy_cap_info[0])
+ * These are used to determine the presence of additional MCS/NSS maps.
+ */
+#define IEEE80211_HE_PHYCAP0_CHAN_WIDTH_40_IN_2G		0x02
+#define IEEE80211_HE_PHYCAP0_CHAN_WIDTH_40_80_IN_5G		0x04
+#define IEEE80211_HE_PHYCAP0_CHAN_WIDTH_160_IN_5G		0x08
+#define IEEE80211_HE_PHYCAP0_CHAN_WIDTH_8080_IN_5G		0x10
+
+/*
+ * Size of the HE Tx/Rx MCS NSS Support field, in bytes, for a given
+ * HE PHY capabilities byte 0.
+ */
+#define IEEE80211_HE_MCS_NSS_SIZE(_phycap0)	(IEEE80211_HE_MCS_NSS_80_LEN + \
+	((((_phycap0) & IEEE80211_HE_PHYCAP0_CHAN_WIDTH_160_IN_5G) ? 4 : 0)) + \
+	((((_phycap0) & IEEE80211_HE_PHYCAP0_CHAN_WIDTH_8080_IN_5G) ? 4 : 0)))
+
+/*
+ * HE MCS and NSS map (HE-MCS/NSS set)
+ *
+ * Set of HE MCS supported for a given number of spatial streams, `n'.
+ * Used by the HE capabilities IE and by the basic HE MCS set in
+ * the HE operation IE.
+ */
+#define IEEE80211_HE_MCS_FOR_SS_MASK(n)	(0x3 << (2 * ((n) - 1)))
+#define IEEE80211_HE_MCS_FOR_SS_SHIFT(n)	(2 * ((n) - 1))
+#define IEEE80211_HE_MCS_0_7			0
+#define IEEE80211_HE_MCS_0_9			1
+#define IEEE80211_HE_MCS_0_11			2
+#define IEEE80211_HE_MCS_SS_NOT_SUPP		3
+
+/* The highest number of spatial streams supported by HE */
+#define IEEE80211_HE_NUM_SS			8
+
+/*
+ * HE Operation element fixed fields (not including the Ext ID byte)
+ */
+#define IEEE80211_HEOP_PARAMS_LEN		4
+#define IEEE80211_HEOP_BASIC_MCS_LEN		2
+#define IEEE80211_HEOP_FIXED_LEN		(IEEE80211_HEOP_PARAMS_LEN + \
+					IEEE80211_HEOP_BASIC_MCS_LEN)
+
 /*
  * EDCA Access Categories.
  */

package/libc/include/generic-openbsd/net80211/ieee80211_ioctl.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_ioctl.h,v 1.44 2025/03/22 07:24:08 kevlo Exp $	*/
+/*	$OpenBSD: ieee80211_ioctl.h,v 1.45 2026/03/26 12:15:01 kirill Exp $	*/
 /*	$NetBSD: ieee80211_ioctl.h,v 1.7 2004/04/30 22:51:04 dyoung Exp $	*/
 
 /*-
@@ -385,9 +385,10 @@ struct ieee80211_nodereq {
 #define IEEE80211_NODEREQ_ASSOCFAIL_BSSID	0x20
 #define IEEE80211_NODEREQ_ASSOCFAIL_WPA_PROTO	0x40
 #define IEEE80211_NODEREQ_ASSOCFAIL_WPA_KEY	0x80
+#define IEEE80211_NODEREQ_ASSOCFAIL_CSA		0x100
 #define IEEE80211_NODEREQ_ASSOCFAIL_BITS	\
 	"\20\1!CHAN\2!IBSS\3!PRIVACY\4!BASICRATE\5!ESSID\6!BSSID\7!WPAPROTO" \
-	"\10!WPAKEY"
+	"\10!WPAKEY\11!CSA"
 
 /* get the entire node cache */
 struct ieee80211_nodereq_all {

package/libc/include/generic-openbsd/net80211/ieee80211_node.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_node.h,v 1.97 2025/08/01 20:39:26 stsp Exp $	*/
+/*	$OpenBSD: ieee80211_node.h,v 1.101 2026/03/29 21:16:21 kirill Exp $	*/
 /*	$NetBSD: ieee80211_node.h,v 1.9 2004/04/30 22:57:32 dyoung Exp $	*/
 
 /*-
@@ -370,6 +370,20 @@ struct ieee80211_node {
 	uint8_t			ni_vht_chan_center_freq_idx1;
 	uint16_t		ni_vht_basic_mcs;
 
+	/* HE capabilities */
+	uint8_t			ni_he_mac_cap[IEEE80211_HE_MAC_CAPS_LEN];
+	uint8_t			ni_he_phy_cap[IEEE80211_HE_PHY_CAPS_LEN];
+	uint16_t		ni_he_rxmcs_80;
+	uint16_t		ni_he_txmcs_80;
+	uint16_t		ni_he_rxmcs_160;
+	uint16_t		ni_he_txmcs_160;
+	uint16_t		ni_he_rxmcs_80p80;
+	uint16_t		ni_he_txmcs_80p80;
+
+	/* HE operation */
+	uint8_t			ni_he_oper_params[IEEE80211_HEOP_PARAMS_LEN];
+	uint16_t		ni_he_basic_mcs;
+
 	/* Timeout handlers which trigger Tx Block Ack negotiation. */
 	struct timeout		ni_addba_req_to[IEEE80211_NUM_TID];
 	int			ni_addba_req_intval[IEEE80211_NUM_TID];
@@ -381,6 +395,7 @@ struct ieee80211_node {
 
 	int			ni_txmcs;	/* current MCS used for TX */
 	int			ni_vht_ss;	/* VHT # spatial streams */
+	int			ni_he_ss;	/* HE # spatial streams */
 
 	/* others */
 	u_int16_t		ni_associd;	/* assoc response */
@@ -398,6 +413,7 @@ struct ieee80211_node {
 #define IEEE80211_NODE_ASSOCFAIL_BSSID		0x20
 #define IEEE80211_NODE_ASSOCFAIL_WPA_PROTO	0x40
 #define IEEE80211_NODE_ASSOCFAIL_WPA_KEY	0x80
+#define IEEE80211_NODE_ASSOCFAIL_CSA		0x100
 
 	int			ni_inact;	/* inactivity mark count */
 	int			ni_txrate;	/* index to ni_rates[] */
@@ -427,6 +443,9 @@ struct ieee80211_node {
 #define IEEE80211_NODE_VHTCAP		0x40000	/* claims to support VHT */
 #define IEEE80211_NODE_VHT_SGI80	0x80000	/* SGI on 80 MHz negotiated */ 
 #define IEEE80211_NODE_VHT_SGI160	0x100000 /* SGI on 160 MHz negotiated */ 
+#define IEEE80211_NODE_HE		0x200000 /* HE negotiated */
+#define IEEE80211_NODE_HECAP		0x400000 /* claims to support HE */
+#define IEEE80211_NODE_CSA		0x800000 /* channel switch announced */
 
 	/* If not NULL, this function gets called when ni_refcnt hits zero. */
 	void			(*ni_unref_cb)(struct ieee80211com *,
@@ -590,7 +609,11 @@ ieee80211_node_supports_vht_chan160(struct ieee80211_node *ni)
 
 	cap_chan_width = (ni->ni_vhtcaps & IEEE80211_VHTCAP_CHAN_WIDTH_MASK) >>
 	    IEEE80211_VHTCAP_CHAN_WIDTH_SHIFT;
-	if (cap_chan_width != IEEE80211_VHTCAP_CHAN_WIDTH_160)
+	if (cap_chan_width != IEEE80211_VHTCAP_CHAN_WIDTH_160 &&
+	    cap_chan_width != IEEE80211_VHTCAP_CHAN_WIDTH_160_8080 &&
+	    ((ni->ni_vhtcaps & IEEE80211_VHTCAP_EXT_NSS_BW_MASK) == 0 ||
+	    (ni->ni_vht_tx_max_lgi_mbit_s &
+	    IEEE80211_VHT_EXT_NSS_BW_CAPABLE) == 0))
 		return 0;
 
 	op_chan_width = (ni->ni_vht_chan_width &
@@ -600,6 +623,23 @@ ieee80211_node_supports_vht_chan160(struct ieee80211_node *ni)
 	return (op_chan_width == IEEE80211_VHTOP0_CHAN_WIDTH_160);
 }
 
+/* 
+ * Check if the peer supports HE.
+ * Require a HE capabilities IE and support for HE MCS with a single
+ * spatial stream.
+ */
+static inline int
+ieee80211_node_supports_he(struct ieee80211_node *ni)
+{
+	uint16_t rx_mcs;
+
+	rx_mcs = (ni->ni_he_rxmcs_80 & IEEE80211_HE_MCS_FOR_SS_MASK(1)) >>
+	    IEEE80211_HE_MCS_FOR_SS_SHIFT(1);
+
+	return ((ni->ni_flags & IEEE80211_NODE_HECAP) &&
+	    rx_mcs != IEEE80211_HE_MCS_SS_NOT_SUPP);
+}
+
 struct ieee80211com;
 
 typedef void ieee80211_iter_func(void *, struct ieee80211_node *);
@@ -642,6 +682,11 @@ void ieee80211_setup_vhtcaps(struct ieee80211_node *, const uint8_t *,
 void ieee80211_clear_vhtcaps(struct ieee80211_node *);
 int ieee80211_setup_vhtop(struct ieee80211_node *, const uint8_t *,
     uint8_t, int);
+void ieee80211_setup_hecaps(struct ieee80211_node *, const uint8_t *,
+    uint8_t);
+void ieee80211_clear_hecaps(struct ieee80211_node *);
+int ieee80211_setup_heop(struct ieee80211_node *, const uint8_t *,
+    uint8_t, int);
 int ieee80211_setup_rates(struct ieee80211com *,
 	    struct ieee80211_node *, const u_int8_t *, const u_int8_t *, int);
 enum ieee80211_phymode ieee80211_node_abg_mode(struct ieee80211com *,
@@ -656,6 +701,7 @@ void ieee80211_node_join(struct ieee80211com *,
 void ieee80211_node_leave(struct ieee80211com *,
 		struct ieee80211_node *);
 int ieee80211_match_bss(struct ieee80211com *, struct ieee80211_node *, int);
+void ieee80211_node_switch_bss(struct ieee80211com *, struct ieee80211_node *);
 void ieee80211_node_tx_stopped(struct ieee80211com *, struct ieee80211_node *);
 struct ieee80211_node *ieee80211_node_choose_bss(struct ieee80211com *, int,
 		struct ieee80211_node **);

package/libc/include/generic-openbsd/net80211/ieee80211_proto.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_proto.h,v 1.50 2025/06/14 08:46:34 jsg Exp $	*/
+/*	$OpenBSD: ieee80211_proto.h,v 1.51 2026/03/19 16:50:32 chris Exp $	*/
 /*	$NetBSD: ieee80211_proto.h,v 1.3 2003/10/13 04:23:56 dyoung Exp $	*/
 
 /*-
@@ -137,6 +137,7 @@ extern	u_int8_t *ieee80211_add_xrates(u_int8_t *,
 extern	u_int8_t *ieee80211_add_htcaps(u_int8_t *, struct ieee80211com *);
 extern	u_int8_t *ieee80211_add_htop(u_int8_t *, struct ieee80211com *);
 extern	u_int8_t *ieee80211_add_vhtcaps(u_int8_t *, struct ieee80211com *);
+extern	u_int8_t *ieee80211_add_hecaps(u_int8_t *, struct ieee80211com *);
 extern	u_int8_t *ieee80211_add_tie(u_int8_t *, u_int8_t, u_int32_t);
 
 extern	int ieee80211_parse_rsn(struct ieee80211com *, const u_int8_t *,
@@ -169,6 +170,8 @@ extern	void ieee80211_ht_negotiate(struct ieee80211com *,
     struct ieee80211_node *);
 extern	void ieee80211_vht_negotiate(struct ieee80211com *,
     struct ieee80211_node *);
+extern	void ieee80211_he_negotiate(struct ieee80211com *,
+    struct ieee80211_node *);
 extern	void ieee80211_tx_ba_timeout(void *);
 extern	void ieee80211_rx_ba_timeout(void *);
 extern	int ieee80211_addba_request(struct ieee80211com *,

package/libc/include/generic-openbsd/net80211/ieee80211_var.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_var.h,v 1.112 2025/08/01 20:39:26 stsp Exp $	*/
+/*	$OpenBSD: ieee80211_var.h,v 1.114 2026/03/19 16:50:32 chris Exp $	*/
 /*	$NetBSD: ieee80211_var.h,v 1.7 2004/05/06 03:07:10 dyoung Exp $	*/
 
 /*-
@@ -92,8 +92,9 @@ enum ieee80211_phymode {
 	IEEE80211_MODE_11G	= 3,	/* 2GHz, OFDM */
 	IEEE80211_MODE_11N	= 4,	/* 2GHz/5GHz, OFDM/HT */
 	IEEE80211_MODE_11AC	= 5,	/* 5GHz, OFDM/VHT */
+	IEEE80211_MODE_11AX	= 6,	/* 2GHz/5GHz, OFDM/HE */
 };
-#define	IEEE80211_MODE_MAX	(IEEE80211_MODE_11AC+1)
+#define	IEEE80211_MODE_MAX	(IEEE80211_MODE_11AX+1)
 
 enum ieee80211_opmode {
 	IEEE80211_M_STA		= 1,	/* infrastructure station */
@@ -142,6 +143,7 @@ struct ieee80211_channel {
  */
 #define IEEE80211_CHANX_80MHZ	0x00000001 /* use of 80 MHz is allowed */
 #define IEEE80211_CHANX_160MHZ	0x00000002 /* use of 160 MHz is allowed */
+#define IEEE80211_CHANX_HE	0x00000004 /* 11ax/HE channel */
 
 /*
  * Useful combinations of channel characteristics.
@@ -185,6 +187,8 @@ struct ieee80211_channel {
 	(((_c)->ic_xflags & IEEE80211_CHANX_80MHZ) != 0)
 #define	IEEE80211_CHAN_160MHZ_ALLOWED(_c) \
 	(((_c)->ic_xflags & IEEE80211_CHANX_160MHZ) != 0)
+#define	IEEE80211_CHAN_HE(_c) \
+	(((_c)->ic_xflags & IEEE80211_CHANX_HE) != 0)
 
 /*
  * EDCA AC parameters.
@@ -337,6 +341,8 @@ struct ieee80211com {
 							 */
 	struct ieee80211_edca_ac_params ic_edca_ac[EDCA_NUM_AC];
 	u_int			ic_edca_updtcount;
+	u_int			ic_edca_txop_count[EDCA_NUM_AC];
+	struct timeval		ic_edca_txop_time[EDCA_NUM_AC];
 	u_int16_t		ic_tid_noack;
 	u_int8_t		ic_globalcnt[EAPOL_KEY_NONCE_LEN];
 	u_int8_t		ic_nonce[EAPOL_KEY_NONCE_LEN];
@@ -383,6 +389,15 @@ struct ieee80211com {
 	uint16_t		ic_vht_txmcs;
 	uint16_t		ic_vht_tx_max_lgi_mbit_s;
 
+	u_int8_t		ic_he_mac_cap[IEEE80211_HE_MAC_CAPS_LEN];
+	u_int8_t		ic_he_phy_cap[IEEE80211_HE_PHY_CAPS_LEN];
+	uint16_t		ic_he_rxmcs_80;
+	uint16_t		ic_he_txmcs_80;
+	uint16_t		ic_he_rxmcs_160;
+	uint16_t		ic_he_txmcs_160;
+	uint16_t		ic_he_rxmcs_80p80;
+	uint16_t		ic_he_txmcs_80p80;
+
 	TAILQ_HEAD(, ieee80211_ess)	 ic_ess;
 };
 #define	ic_if		ic_ac.ac_if
@@ -440,6 +455,7 @@ struct ieee80211_ess {
 #define	IEEE80211_F_BGSCAN	0x08000000	/* STATUS: background scan */
 #define IEEE80211_F_AUTO_JOIN	0x10000000	/* CONF: auto-join active */
 #define	IEEE80211_F_VHTON	0x20000000	/* CONF: VHT enabled */
+#define	IEEE80211_F_HEON	0x40000000	/* CONF: HE enabled */
 
 /* ic_xflags */
 #define	IEEE80211_F_TX_MGMT_ONLY 0x00000001	/* leave data frames on ifq */

package/libc/include/generic-openbsd/netinet/if_ether.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.h,v 1.96 2025/07/07 00:55:15 jsg Exp $	*/
+/*	$OpenBSD: if_ether.h,v 1.99 2025/12/02 03:24:19 dlg Exp $	*/
 /*	$NetBSD: if_ether.h,v 1.22 1996/05/11 13:00:00 mycroft Exp $	*/
 
 /*
@@ -220,12 +220,12 @@ do {									\
 
 #include <net/if_var.h>	/* for "struct ifnet" */
 
-struct ether_brport {
-	struct mbuf	*(*eb_input)(struct ifnet *, struct mbuf *,
+struct ether_port {
+	struct mbuf	*(*ep_input)(struct ifnet *, struct mbuf *,
 			   uint64_t, void *, struct netstack *);
-	void		(*eb_port_take)(void *);
-	void		(*eb_port_rele)(void *);
-	void		  *eb_port;
+	void		*(*ep_port_take)(void *);
+	void		 (*ep_port_rele)(void *, void *);
+	void		  *ep_port;
 };
 
 /*
@@ -241,8 +241,8 @@ struct	arpcom {
 	int	 ac_multicnt;			/* length of ac_multiaddrs */
 	int	 ac_multirangecnt;		/* number of mcast ranges */
 
-	void	*ac_trunkport;
-	const struct ether_brport *ac_brport;
+	const struct ether_port *ac_trport;
+	const struct ether_port *ac_brport;
 };
 
 extern int arpt_keep;				/* arp resolved cache expire */
@@ -289,11 +289,11 @@ void	ether_rtrequest(struct ifnet *, int, struct rtentry *);
 char	*ether_sprintf(u_char *);
 
 int	ether_brport_isset(struct ifnet *);
-void	ether_brport_set(struct ifnet *, const struct ether_brport *);
+void	ether_brport_set(struct ifnet *, const struct ether_port *);
 void	ether_brport_clr(struct ifnet *);
-const struct ether_brport *
+const struct ether_port *
 	ether_brport_get(struct ifnet *);
-const struct ether_brport *
+const struct ether_port *
 	ether_brport_get_locked(struct ifnet *);
 
 uint64_t	ether_addr_to_e64(const struct ether_addr *);
@@ -313,6 +313,7 @@ struct ether_extracted {
 };
 
 void ether_extract_headers(struct mbuf *, struct ether_extracted *);
+struct mbuf *ether_offload_ifcap(struct ifnet *, struct mbuf *);
 
 /*
  * Ethernet multicast address structure.  There is one of these for each