gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mt76: mt7925: fix NAN committed CRB timeline layout

Browse Source 
The committed CRB timeline carried a local_map_id byte that does not
exist in the firmware NAN_SCHEDULE_TIMELINE_T layout (map id plus 3
reserved bytes), shifting the availability bitmap. Drop it and match
the firmware structure.

The common-slot check is also dropped as redundant: mac80211 already
tracks common slots, so avail_map is built directly from the peer
schedule.

Fixes: 0f3605e4f8de ("wifi: mt76: mt7925: wire up NAN operations")
Co-developed-by: Sean Wang <[email protected]>
Signed-off-by: Sean Wang <[email protected]>
Signed-off-by: Stella Liu <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Stella Liu
2026-08-25 11:25:29 +02:00
committed by Felix Fietkau
parent b2081f2a03
commit b51cd50b20
2 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt7925/nan.c
+11 -26
View File
@@ -753,52 +753,38 @@ static int mt7925_nan_peer_cap_tlv(struct sk_buff *skb,
static void
mt7925_nan_fill_crb_committed(struct mt7925_nan_sched_update_crb_tlv *crb_tlv,
struct ieee80211_vif *vif,
struct ieee80211_nan_peer_sched *sched)
{
struct ieee80211_nan_sched_cfg *local_sched;
u8 local_map_id;
u32 m, slot;
if (!vif || !sched)
if (!sched)
return;
local_sched = &vif->cfg.nan_sched;
local_map_id = mt7925_nan_avail_attr_ctrl(local_sched) &
NAN_AVAIL_CTRL_MAPID;
for (m = 0; m < CFG80211_NAN_MAX_PEER_MAPS &&
m < NAN_TIMELINE_MGMT_SIZE; m++) {
struct ieee80211_nan_peer_map *map = &sched->maps[m];
struct mt7925_nan_sched_timeline *tl =
&crb_tlv->comm_faw_timeline[m];
struct ieee80211_nan_peer_map *map = &sched->maps[m];
u32 avail_map = 0;
if (map->map_id == CFG80211_NAN_INVALID_MAP_ID)
continue;
tl->map_id = map->map_id;
tl->local_map_id = local_map_id;
/*
* Convert peer schedule slots to FW avail_map bitmap.
* Each bit in avail_map[0] represents one time slot where
* the peer has committed availability.
*/
for (slot = 0; slot < CFG80211_NAN_SCHED_NUM_TIME_SLOTS;
slot++) {
struct ieee80211_nan_channel *local_ch;
struct ieee80211_nan_channel *peer_ch;
struct ieee80211_nan_channel *ch = map->slots[slot];
local_ch = local_sched->schedule[slot];
peer_ch = map->slots[slot];
if (!local_ch || !local_ch->chanctx_conf ||
!peer_ch || !peer_ch->chanctx_conf)
if (!ch || !ch->chanctx_conf)
continue;
if (local_ch->chanctx_conf != peer_ch->chanctx_conf)
continue;
avail_map |= BIT(slot);
tl->avail_map[0] |= cpu_to_le32(BIT(slot));
}
tl->avail_map[0] = cpu_to_le32(avail_map);
}
}
@@ -824,8 +810,7 @@ static int mt7925_nan_update_crb_tlv(struct sk_buff *skb,
crb_tlv->is_use_ranging = false;
crb_tlv->comm_ndc_ctrl.is_valid = false;
mt7925_nan_fill_crb_committed(crb_tlv, msta->vif->phy->dev->nan_vif,
sta->nan_sched);
mt7925_nan_fill_crb_committed(crb_tlv, sta->nan_sched);
return 0;
}
mt7925/nan.h
+1 -2
View File
@@ -348,8 +348,7 @@ struct mt7925_nan_sched_update_peer_cap_tlv {
struct mt7925_nan_sched_timeline {
u8 map_id;
u8 local_map_id;
u8 reserved[2];
u8 reserved[3];
union {
__le32 avail_map[NAN_TOTAL_DW];
u8 avail_block[NAN_TOTAL_DW * 4];