From: Allen Ye <allen.ye@mediatek.com>
To: <linux-wireless@vger.kernel.org>
Cc: Johannes Berg <johannes.berg@intel.com>,
Felix Fietkau <nbd@nbd.name>,
Lorenzo Bianconi <lorenzo.bianconi@redhat.com>,
Evelyn Tsai <evelyn.tsai@mediatek.com>,
Money Wang <money.wang@mediatek.com>,
<linux-mediatek@lists.infradead.org>,
Allen Ye <allen.ye@mediatek.com>
Subject: [PATCH v2] wifi: mac80211: Update bssid indicator with real BSS numbers
Date: Fri, 8 Dec 2023 14:38:20 +0800 [thread overview]
Message-ID: <20231208063820.25983-1-allen.ye@mediatek.com> (raw)
The cnt member in mbssid is the count of total number of MBSSID elements
instead of BSSID. Therefore, we fix this by reading the MaxBSSID Indicator
field directly.
Co-developed-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
Co-developed-by: Money Wang <money.wang@mediatek.com>
Signed-off-by: Money Wang <money.wang@mediatek.com>
Signed-off-by: Allen Ye <allen.ye@mediatek.com>
---
v2:
- Fix From and s-o-b format error
---
net/mac80211/cfg.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 606b1b2e4123..f90bcd59f85a 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1164,9 +1164,11 @@ ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
/* copy in optional mbssid_ies */
if (mbssid) {
u8 *pos = new->tail + new->tail_len;
+ const struct element *mbssid_elem;
new->mbssid_ies = (void *)pos;
pos += struct_size(new->mbssid_ies, elem, mbssid->cnt);
+ mbssid_elem = (const struct element *)pos;
pos += ieee80211_copy_mbssid_beacon(pos, new->mbssid_ies,
mbssid);
if (rnr) {
@@ -1175,8 +1177,7 @@ ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata,
ieee80211_copy_rnr_beacon(pos, new->rnr_ies, rnr);
}
/* update bssid_indicator */
- link_conf->bssid_indicator =
- ilog2(__roundup_pow_of_two(mbssid->cnt + 1));
+ link_conf->bssid_indicator = mbssid_elem->data[0];
}
if (csa) {
--
2.18.0
next reply other threads:[~2023-12-08 6:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-08 6:38 Allen Ye [this message]
2023-12-14 12:29 ` [PATCH v2] wifi: mac80211: Update bssid indicator with real BSS numbers Johannes Berg
2023-12-27 9:38 ` Allen Ye (葉芷勳)
2024-04-23 11:21 ` Johannes Berg
2024-04-23 11:28 ` Johannes Berg
2024-05-02 16:45 ` Aloka Dixit
2024-04-23 19:12 ` Jeff Johnson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231208063820.25983-1-allen.ye@mediatek.com \
--to=allen.ye@mediatek.com \
--cc=evelyn.tsai@mediatek.com \
--cc=johannes.berg@intel.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=money.wang@mediatek.com \
--cc=nbd@nbd.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).