Commit a1de6407 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

mac80211: Handle station association response with EHT 



When the association is an EHT association, parse the EHT
element from the association response and update the
station's EHT capabilities accordingly.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Link: https://lore.kernel.org/r/20220214173004.f33574718755.I21182234c5303d9423eabd5eb997e7cf75f8e0c8@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 820acc81

include/net/mac80211.h

+4 −0
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ struct ieee80211_fils_discovery { 
 * @tx_pwr_env: transmit power envelope array of BSS.

 * @tx_pwr_env_num: number of @tx_pwr_env.

 * @pwr_reduction: power constraint of BSS.

 * @eht_support: does this BSS support EHT

 */

struct ieee80211_bss_conf {

	const u8 *bssid;
@@ -710,6 +711,7 @@ struct ieee80211_bss_conf { 
	struct ieee80211_tx_pwr_env tx_pwr_env[IEEE80211_TPE_MAX_IE_COUNT];

	u8 tx_pwr_env_num;

	u8 pwr_reduction;

	bool eht_support;

};



/**
@@ -2071,6 +2073,7 @@ struct ieee80211_sta_txpwr { 
 * @vht_cap: VHT capabilities of this STA; restricted to our own capabilities

 * @he_cap: HE capabilities of this STA

 * @he_6ghz_capa: on 6 GHz, holds the HE 6 GHz band capabilities

 * @eht_cap: EHT capabilities of this STA

 * @max_rx_aggregation_subframes: maximal amount of frames in a single AMPDU

 *	that this station is allowed to transmit to us.

 *	Can be modified by driver.
@@ -2111,6 +2114,7 @@ struct ieee80211_sta { 
	struct ieee80211_sta_vht_cap vht_cap;

	struct ieee80211_sta_he_cap he_cap;

	struct ieee80211_he_6ghz_capa he_6ghz_capa;

	struct ieee80211_sta_eht_cap eht_cap;

	u16 max_rx_aggregation_subframes;

	bool wme;

	u8 uapsd_queues;

net/mac80211/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ mac80211-y := \ 
	trace.o mlme.o \

	tdls.o \

	ocb.o \

	airtime.o

	airtime.o \

	eht.o



mac80211-$(CONFIG_MAC80211_LEDS) += led.o

mac80211-$(CONFIG_MAC80211_DEBUGFS) += \

net/mac80211/eht.c

0 → 100644
+76 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * EHT handling

 *

 * Copyright(c) 2021-2022 Intel Corporation

 */



#include "ieee80211_i.h"



void

ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata,

				    struct ieee80211_supported_band *sband,

				    const u8 *he_cap_ie, u8 he_cap_len,

				    const struct ieee80211_eht_cap_elem *eht_cap_ie_elem,

				    u8 eht_cap_len, struct sta_info *sta)

{

	struct ieee80211_sta_eht_cap *eht_cap = &sta->sta.eht_cap;

	struct ieee80211_he_cap_elem *he_cap_ie_elem = (void *)he_cap_ie;

	u8 eht_ppe_size = 0;

	u8 mcs_nss_size;

	u8 eht_total_size = sizeof(eht_cap->eht_cap_elem);

	u8 *pos = (u8 *)eht_cap_ie_elem;



	memset(eht_cap, 0, sizeof(*eht_cap));



	if (!eht_cap_ie_elem ||

	    !ieee80211_get_eht_iftype_cap(sband,

					 ieee80211_vif_type_p2p(&sdata->vif)))

		return;



	mcs_nss_size = ieee80211_eht_mcs_nss_size(he_cap_ie_elem,

						  &eht_cap_ie_elem->fixed);



	eht_total_size += mcs_nss_size;



	/* Calculate the PPE thresholds length only if the header is present */

	if (eht_cap_ie_elem->fixed.phy_cap_info[5] &

			IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) {

		u16 eht_ppe_hdr;



		if (eht_cap_len < eht_total_size + sizeof(u16))

			return;



		eht_ppe_hdr = get_unaligned_le16(eht_cap_ie_elem->optional + mcs_nss_size);

		eht_ppe_size =

			ieee80211_eht_ppe_size(eht_ppe_hdr,

					       eht_cap_ie_elem->fixed.phy_cap_info);

		eht_total_size += eht_ppe_size;



		/* we calculate as if NSS > 8 are valid, but don't handle that */

		if (eht_ppe_size > sizeof(eht_cap->eht_ppe_thres))

			return;

	}



	if (eht_cap_len < eht_total_size)

		return;



	/* Copy the static portion of the EHT capabilities */

	memcpy(&eht_cap->eht_cap_elem, pos, sizeof(eht_cap->eht_cap_elem));

	pos += sizeof(eht_cap->eht_cap_elem);



	/* Copy MCS/NSS which depends on the peer capabilities */

	memset(&eht_cap->eht_mcs_nss_supp, 0,

	       sizeof(eht_cap->eht_mcs_nss_supp));

	memcpy(&eht_cap->eht_mcs_nss_supp, pos, mcs_nss_size);



	if (eht_ppe_size)

		memcpy(eht_cap->eht_ppe_thres,

		       &eht_cap_ie_elem->optional[mcs_nss_size],

		       eht_ppe_size);



	eht_cap->has_eht = true;



	sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(sta);

	sta->sta.bandwidth = ieee80211_sta_cur_vht_bw(sta);

}

net/mac80211/ieee80211_i.h

+7 −0
Original line number Diff line number Diff line
@@ -2525,4 +2525,11 @@ u8 *ieee80211_ie_build_eht_cap(u8 *pos, 
			       const struct ieee80211_sta_he_cap *he_cap,

			       const struct ieee80211_sta_eht_cap *eht_cap,

			       u8 *end);



void

ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata,

				    struct ieee80211_supported_band *sband,

				    const u8 *he_cap_ie, u8 he_cap_len,

				    const struct ieee80211_eht_cap_elem *eht_cap_ie_elem,

				    u8 eht_cap_len, struct sta_info *sta);

#endif /* IEEE80211_I_H */

net/mac80211/mlme.c

+15 −0
Original line number Diff line number Diff line
@@ -3579,10 +3579,25 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, 
			bss_conf->twt_protected = false;



		changed |= ieee80211_recalc_twt_req(sdata, sta, elems);



		if (elems->eht_operation && elems->eht_cap &&

		    !(ifmgd->flags & IEEE80211_STA_DISABLE_EHT)) {

			ieee80211_eht_cap_ie_to_sta_eht_cap(sdata, sband,

							    elems->he_cap,

							    elems->he_cap_len,

							    elems->eht_cap,

							    elems->eht_cap_len,

							    sta);



			bss_conf->eht_support = sta->sta.eht_cap.has_eht;

		} else {

			bss_conf->eht_support = false;

		}

	} else {

		bss_conf->he_support = false;

		bss_conf->twt_requester = false;

		bss_conf->twt_protected = false;

		bss_conf->eht_support = false;

	}



	bss_conf->twt_broadcast =