From: Benjamin Berg Date: Tue, 2 Jan 2024 19:35:30 +0000 (+0200) Subject: wifi: cfg80211: correct comment about MLD ID X-Git-Tag: v6.6.14~373 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b3946813382c7b4ec6d538661fb529b9ed5201c;p=platform%2Fkernel%2Flinux-starfive.git wifi: cfg80211: correct comment about MLD ID [ Upstream commit 2a0698f86d4dfc43cc0c1703efb7ba6b1506a4e2 ] The comment was referencing the wrong section of the documentation and was also subtly wrong as it assumed the rules that apply when sending probe requests directly to a nontransmitted AP. However, in that case the response comes from the transmitting AP and the AP MLD ID will be included. Fixes: 2481b5da9c6b ("wifi: cfg80211: handle BSS data contained in ML probe responses") Signed-off-by: Benjamin Berg Signed-off-by: Miri Korenblit Link: https://msgid.link/20240102213313.0917ab4b5d7f.I76aff0e261a5de44ffb467e591a46597a30d7c0a@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- diff --git a/net/wireless/scan.c b/net/wireless/scan.c index e4cc620..a7d7469 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -2625,8 +2625,11 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy, /* MLD capabilities and operations */ pos += 2; - /* Not included when the (nontransmitted) AP is responding itself, - * but defined to zero then (Draft P802.11be_D3.0, 9.4.2.170.2) + /* + * The MLD ID of the reporting AP is always zero. It is set if the AP + * is part of an MBSSID set and will be non-zero for ML Elements + * relating to a nontransmitted BSS (matching the Multi-BSSID Index, + * Draft P802.11be_D3.2, 35.3.4.2) */ if (u16_get_bits(control, IEEE80211_MLC_BASIC_PRES_MLD_ID)) { mld_id = *pos;