Skip to content

Commit 97a1beb

Browse files
committed
wifi: mt76: mt7996: prepare mt7996_mcu_set_timing for MLO support
Pass in struct ieee80211_bss_conf in order to use link specific data. Link: https://patch.msgid.link/[email protected] Signed-off-by: Felix Fietkau <[email protected]>
1 parent c0df2f0 commit 97a1beb

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

drivers/net/wireless/mediatek/mt76/mt7996/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ static void mt7996_bss_info_changed(struct ieee80211_hw *hw,
643643

644644
if (slottime != phy->slottime) {
645645
phy->slottime = slottime;
646-
mt7996_mcu_set_timing(phy, vif);
646+
mt7996_mcu_set_timing(phy, vif, info);
647647
}
648648
}
649649

drivers/net/wireless/mediatek/mt76/mt7996/mcu.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,13 +1108,14 @@ int mt7996_mcu_add_bss_info(struct mt7996_phy *phy, struct ieee80211_vif *vif,
11081108
MCU_WMWA_UNI_CMD(BSS_INFO_UPDATE), true);
11091109
}
11101110

1111-
int mt7996_mcu_set_timing(struct mt7996_phy *phy, struct ieee80211_vif *vif)
1111+
int mt7996_mcu_set_timing(struct mt7996_phy *phy, struct ieee80211_vif *vif,
1112+
struct ieee80211_bss_conf *link_conf)
11121113
{
1113-
struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
11141114
struct mt7996_dev *dev = phy->dev;
1115+
struct mt76_vif_link *mlink = mt76_vif_conf_link(&dev->mt76, vif, link_conf);
11151116
struct sk_buff *skb;
11161117

1117-
skb = __mt7996_mcu_alloc_bss_req(&dev->mt76, &mvif->deflink.mt76,
1118+
skb = __mt7996_mcu_alloc_bss_req(&dev->mt76, mlink,
11181119
MT7996_BSS_UPDATE_MAX_SIZE);
11191120
if (IS_ERR(skb))
11201121
return PTR_ERR(skb);

drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,8 @@ int mt7996_mcu_set_radar_th(struct mt7996_dev *dev, int index,
562562
const struct mt7996_dfs_pattern *pattern);
563563
int mt7996_mcu_set_radio_en(struct mt7996_phy *phy, bool enable);
564564
int mt7996_mcu_set_rts_thresh(struct mt7996_phy *phy, u32 val);
565-
int mt7996_mcu_set_timing(struct mt7996_phy *phy, struct ieee80211_vif *vif);
565+
int mt7996_mcu_set_timing(struct mt7996_phy *phy, struct ieee80211_vif *vif,
566+
struct ieee80211_bss_conf *link_conf);
566567
int mt7996_mcu_get_chan_mib_info(struct mt7996_phy *phy, bool chan_switch);
567568
int mt7996_mcu_get_temperature(struct mt7996_phy *phy);
568569
int mt7996_mcu_set_thermal_throttling(struct mt7996_phy *phy, u8 state);

0 commit comments

Comments
 (0)