Commit 081e1e7e authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Johannes Berg
Browse files

mac80211: he: remove non-bss-conf fields from bss_conf 



ack_enabled and multi_sta_back_32bit are station capabilities
and should not be in the bss_conf structure.

Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201129172929.69a7f7753444.I405c4b5245145e24577512c477f19131d4036489@changeid


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

include/net/mac80211.h

+0 −2
Original line number Diff line number Diff line
@@ -635,9 +635,7 @@ struct ieee80211_fils_discovery { 
struct ieee80211_bss_conf {

	const u8 *bssid;

	u8 htc_trig_based_pkt_ext;

	bool multi_sta_back_32bit;

	bool uora_exists;

	bool ack_enabled;

	u8 uora_ocw_range;

	u16 frame_time_rts_th;

	bool he_support;

net/mac80211/mlme.c

+0 −8
Original line number Diff line number Diff line
@@ -3494,14 +3494,6 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, 
			le32_get_bits(elems->he_operation->he_oper_params,

			      IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK);



		bss_conf->multi_sta_back_32bit =

			sta->sta.he_cap.he_cap_elem.mac_cap_info[2] &

			IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP;



		bss_conf->ack_enabled =

			sta->sta.he_cap.he_cap_elem.mac_cap_info[2] &

			IEEE80211_HE_MAC_CAP2_ACK_EN;



		bss_conf->uora_exists = !!elems->uora_element;

		if (elems->uora_element)

			bss_conf->uora_ocw_range = elems->uora_element[0];