Re: [PATCH wireless-next v5 1/3] wifi: ieee80211: add some initial UHR definitions

[Pablo MARTIN-GOMEZ <pmartin-gomez@freebox.fr>]

On 29/01/2026 09:20, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> This is based on Draft P802.11bn_D1.2, but that's still very
> incomplete, so don't handle a number of things and make some
> local decisions such as using 40 bits for MAC capabilities
> and 8 bits for PHY capabilities.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> v5:
>    - use correct EHT MCS len (24 bits, not 24 bytes)
>    - handle DBE AP/non-AP in ieee80211_uhr_capa_size_ok()
> v4:
>    - update to D1.2, including DBE in UHR capabilities
>    - fold in suggestions from Pablo
> ---
>   include/linux/ieee80211-uhr.h | 219 ++++++++++++++++++++++++++++++++++
>   include/linux/ieee80211.h     |  33 ++++-
>   2 files changed, 250 insertions(+), 2 deletions(-)
>   create mode 100644 include/linux/ieee80211-uhr.h
[...]
> +
> +static inline bool ieee80211_uhr_capa_size_ok(const u8 *data, u8 len, bool ap)
> +{
> +	const struct ieee80211_uhr_capa *cap = (const void *)data;
> +	size_t needed = sizeof(*cap) + sizeof(struct ieee80211_uhr_capa_phy);
> +
> +	if (len < needed)
> +		return false;
> +
> +	/*
> +	 * A non-AP STA does not include the DBE Capability Parameters field
> +	 * in the UHR MAC Capabilities Information field.
> +	 */
> +	if (ap && cap->mac.mac_cap[1] & IEEE80211_UHR_MAC_CAP1_DBE_SUPP) {
> +		u8 dbe;
> +
> +		needed += 1;
> +		if (len < needed)
> +			return false;
> +
> +		dbe = cap->variable[0];
> +
> +		if (dbe & IEEE80211_UHR_MAC_CAP_DBE_EHT_MCS_MAP_160_PRES)
> +			needed += 3;
> +
> +		if (dbe & IEEE80211_UHR_MAC_CAP_DBE_EHT_MCS_MAP_320_PRES)
> +			needed += 3;
> +	}
> +
> +	return len >= needed;
> +}
> +
> +static inline const struct ieee80211_uhr_capa_phy *
> +ieee80211_uhr_phy_cap(const struct ieee80211_uhr_capa *cap)
> +{
> +	u8 offs = 0;
> +
> +	if (cap->mac.mac_cap[1] & IEEE80211_UHR_MAC_CAP1_DBE_SUPP) {
Shouldn't we check for 'ap' here too?
> +		u8 dbe = cap->variable[0];
> +
> +		offs += 1;
> +
> +		if (dbe & IEEE80211_UHR_MAC_CAP_DBE_EHT_MCS_MAP_160_PRES)
> +			offs += 3;
> +
> +		if (dbe & IEEE80211_UHR_MAC_CAP_DBE_EHT_MCS_MAP_320_PRES)
> +			offs += 3;
> +	}
> +
> +	return (const void *)&cap->variable[offs];
> +}
> +

[...]

Pablo