[PATCH] wifi: mac80211: update TIM for S1G specification changes
From: Gilad Itzkovitch <hidden>
Date: 2022-11-06 22:16:15
Subsystem:
mac80211, the rest · Maintainers:
Johannes Berg, Linus Torvalds
From: Kieran Frewen <redacted> Updates to the TIM information element to match changes made in the IEEE Std 802.11ah-2020. Signed-off-by: Kieran Frewen <redacted> Co-developed-by: Gilad Itzkovitch <redacted> Signed-off-by: Gilad Itzkovitch <redacted> --- net/mac80211/tx.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index bb2e54610101..383e0242e95f 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c@@ -4769,9 +4769,9 @@ static void __ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata, ps->dtim_count--; } - tim = pos = skb_put(skb, 6); + tim = pos = skb_put(skb, 5); *pos++ = WLAN_EID_TIM; - *pos++ = 4; + *pos++ = 3; *pos++ = ps->dtim_count; *pos++ = link_conf->dtim_period;
@@ -4802,13 +4802,18 @@ static void __ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata, /* Bitmap control */ *pos++ = n1 | aid0; /* Part Virt Bitmap */ - skb_put(skb, n2 - n1); + skb_put(skb, n2 - n1 + 1); memcpy(pos, ps->tim + n1, n2 - n1 + 1); tim[1] = n2 - n1 + 4; } else { *pos++ = aid0; /* Bitmap control */ - *pos++ = 0; /* Part Virt Bitmap */ + + if (ieee80211_get_link_sband(link)->band != NL80211_BAND_S1GHZ) { + skb_put(skb, 1); + tim[1] = 4; + *pos++ = 0; /* Part Virt Bitmap */ + } } }
--
2.34.1