From: Johannes Berg Date: Fri, 29 May 2026 08:25:02 +0000 (+0200) Subject: wifi: mac80211: mlme: allow UHR only with MLO X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29eb4dc882d3b681c699ed550b79129c01e8c80a;p=thirdparty%2Fkernel%2Fstable.git wifi: mac80211: mlme: allow UHR only with MLO UHR requires MLO, not just formally but also in order for the client to understand AP BSS parameter changes, since the Critical Update Counter is inside the Multi- Link Element. Require MLO for UHR connections to avoid otherwise needed complexity such as not enabling any feature that would require tracking critical updates. Link: https://patch.msgid.link/20260529102644.43817ce87042.If4562ae9c5ca83339b397d9a344b68631cb17c4a@changeid Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 2888a382677d..2b7bb371efee 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -389,7 +389,7 @@ ieee80211_determine_ap_chan(struct ieee80211_sub_if_data *sdata, } check_uhr: - if (conn->mode < IEEE80211_CONN_MODE_UHR || !uhr_oper) + if (conn->mode < IEEE80211_CONN_MODE_UHR || !uhr_oper || !elems->ml_basic) return IEEE80211_CONN_MODE_EHT; if (elems->frame_type != (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON)) {