Commit f73ef56c authored by Johannes Berg's avatar Johannes Berg

wifi: mac80211: remove extra element parsing

We already parse all the BSS elements into elems, there's
really no need to separately find EHT/ML again. Remove the
extra code.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240111181514.c4a55da9f778.I112b1ef00904c4183ac7644800f8daa8a4449875@changeidSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent d1155f28
...@@ -4962,32 +4962,12 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, ...@@ -4962,32 +4962,12 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
(IEEE80211_CONN_DISABLE_HE | (IEEE80211_CONN_DISABLE_HE |
IEEE80211_CONN_DISABLE_EHT)) && IEEE80211_CONN_DISABLE_EHT)) &&
he_oper) { he_oper) {
const struct cfg80211_bss_ies *cbss_ies; eht_oper = elems->eht_operation;
const struct element *eht_ml_elem;
const u8 *eht_oper_ie;
cbss_ies = rcu_dereference(cbss->ies);
eht_oper_ie = cfg80211_find_ext_ie(WLAN_EID_EXT_EHT_OPERATION,
cbss_ies->data, cbss_ies->len);
if (eht_oper_ie && eht_oper_ie[1] >=
1 + sizeof(struct ieee80211_eht_operation))
eht_oper = (void *)(eht_oper_ie + 3);
else
eht_oper = NULL;
if (!ieee80211_verify_sta_eht_mcs_support(sdata, sband, eht_oper)) if (!ieee80211_verify_sta_eht_mcs_support(sdata, sband, eht_oper))
*conn_flags |= IEEE80211_CONN_DISABLE_EHT; *conn_flags |= IEEE80211_CONN_DISABLE_EHT;
eht_ml_elem = cfg80211_find_ext_elem(WLAN_EID_EXT_EHT_MULTI_LINK, supports_mlo = elems->ml_basic;
cbss_ies->data, cbss_ies->len);
/* data + 1 / datalen - 1 since it's an extended element */
if (!(*conn_flags & IEEE80211_CONN_DISABLE_EHT) &&
eht_ml_elem &&
ieee80211_mle_type_ok(eht_ml_elem->data + 1,
IEEE80211_ML_CONTROL_TYPE_BASIC,
eht_ml_elem->datalen - 1))
supports_mlo = true;
} }
/* Allow VHT if at least one channel on the sband supports 80 MHz */ /* Allow VHT if at least one channel on the sband supports 80 MHz */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment