Commit 70debba3 authored by Pradeep Kumar Chitrapu's avatar Pradeep Kumar Chitrapu Committed by Johannes Berg
Browse files

mac80211: save HE oper info in BSS config for mesh 



Currently he_support is set only for AP mode. Storing this
information for mesh BSS as well helps driver to determine
HE support. Also save HE operation element params in BSS
conf so that drivers can access this for any configurations
instead of having to parse the beacon to fetch that info.

Signed-off-by: default avatarPradeep Kumar Chitrapu <pradeepc@codeaurora.org>
Link: https://lore.kernel.org/r/20201020183111.25458-2-pradeepc@codeaurora.org


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

include/net/mac80211.h

+2 −1
Original line number Diff line number Diff line
@@ -621,7 +621,8 @@ struct ieee80211_fils_discovery { 
 *	nontransmitted BSSIDs

 * @profile_periodicity: the least number of beacon frames need to be received

 *	in order to discover all the nontransmitted BSSIDs in the set.

 * @he_oper: HE operation information of the AP we are connected to

 * @he_oper: HE operation information of the BSS (AP/Mesh) or of the AP we are

 *	connected to (STA)

 * @he_obss_pd: OBSS Packet Detection parameters.

 * @he_bss_color: BSS coloring settings, if BSS supports HE

 * @fils_discovery: FILS discovery configuration

net/mac80211/mesh.c

+30 −0
Original line number Diff line number Diff line
@@ -667,6 +667,35 @@ void ieee80211_mesh_root_setup(struct ieee80211_if_mesh *ifmsh) 
	}

}



static void

ieee80211_mesh_update_bss_params(struct ieee80211_sub_if_data *sdata,

				 u8 *ie, u8 ie_len)

{

	struct ieee80211_supported_band *sband;

	const u8 *cap;

	const struct ieee80211_he_operation *he_oper = NULL;



	sband = ieee80211_get_sband(sdata);

	if (!sband)

		return;



	if (!ieee80211_get_he_iftype_cap(sband, NL80211_IFTYPE_MESH_POINT) ||

	    sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT ||

	    sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_5 ||

	    sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_10)

		return;



	sdata->vif.bss_conf.he_support = true;



	cap = cfg80211_find_ext_ie(WLAN_EID_EXT_HE_OPERATION, ie, ie_len);

	if (cap && cap[1] >= ieee80211_he_oper_size(&cap[3]))

		he_oper = (void *)(cap + 3);



	if (he_oper)

		sdata->vif.bss_conf.he_oper.params =

			__le32_to_cpu(he_oper->he_oper_params);

}



/**

 * ieee80211_fill_mesh_addresses - fill addresses of a locally originated mesh frame

 * @hdr:	802.11 frame header
@@ -943,6 +972,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) 


	bcn->tail_len = skb->len;

	memcpy(bcn->tail, skb->data, bcn->tail_len);

	ieee80211_mesh_update_bss_params(sdata, bcn->tail, bcn->tail_len);

	bcn->meshconf = (struct ieee80211_meshconf_ie *)

					(bcn->tail + ifmsh->meshconf_offset);

CRA Git | Maintained and supported by SUSTech CRA and CCSE