Skip to content

Commit 747fe94

Browse files
nbd168nbd168
committed
wifi: mt76: mt7996: prepare mt7996_mcu_add_beacon for MLO support
Pass in struct ieee80211_bss_conf. Link: https://patch.msgid.link/[email protected] Signed-off-by: Felix Fietkau <[email protected]>
1 parent 34a41bf commit 747fe94

File tree

4 files changed

+30
-29
lines changed

4 files changed

+30
-29
lines changed

‎drivers/net/wireless/mediatek/mt76/mt7996/mac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ mt7996_update_vif_beacon(void *priv, u8 *mac, struct ieee80211_vif *vif)
15931593
case NL80211_IFTYPE_MESH_POINT:
15941594
case NL80211_IFTYPE_ADHOC:
15951595
case NL80211_IFTYPE_AP:
1596-
mt7996_mcu_add_beacon(hw, vif, vif->bss_conf.enable_beacon);
1596+
mt7996_mcu_add_beacon(hw, vif, &vif->bss_conf);
15971597
break;
15981598
default:
15991599
break;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ static void mt7996_bss_info_changed(struct ieee80211_hw *hw,
669669
mvif->beacon_rates_idx =
670670
mt7996_get_rates_table(hw, vif, true, false);
671671

672-
mt7996_mcu_add_beacon(hw, vif, info->enable_beacon);
672+
mt7996_mcu_add_beacon(hw, vif, info);
673673
}
674674

675675
if (changed & (BSS_CHANGED_UNSOL_BCAST_PROBE_RESP |
@@ -690,7 +690,7 @@ mt7996_channel_switch_beacon(struct ieee80211_hw *hw,
690690
struct mt7996_dev *dev = mt7996_hw_dev(hw);
691691

692692
mutex_lock(&dev->mt76.mutex);
693-
mt7996_mcu_add_beacon(hw, vif, true);
693+
mt7996_mcu_add_beacon(hw, vif, &vif->bss_conf);
694694
mutex_unlock(&dev->mt76.mutex);
695695
}
696696

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

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2411,9 +2411,9 @@ int mt7996_mcu_add_dev_info(struct mt7996_phy *phy, struct ieee80211_vif *vif,
24112411
}
24122412

24132413
static void
2414-
mt7996_mcu_beacon_cntdwn(struct ieee80211_vif *vif, struct sk_buff *rskb,
2415-
struct sk_buff *skb,
2416-
struct ieee80211_mutable_offsets *offs)
2414+
mt7996_mcu_beacon_cntdwn(struct sk_buff *rskb, struct sk_buff *skb,
2415+
struct ieee80211_mutable_offsets *offs,
2416+
bool csa)
24172417
{
24182418
struct bss_bcn_cntdwn_tlv *info;
24192419
struct tlv *tlv;
@@ -2422,7 +2422,7 @@ mt7996_mcu_beacon_cntdwn(struct ieee80211_vif *vif, struct sk_buff *rskb,
24222422
if (!offs->cntdwn_counter_offs[0])
24232423
return;
24242424

2425-
tag = vif->bss_conf.csa_active ? UNI_BSS_INFO_BCN_CSA : UNI_BSS_INFO_BCN_BCC;
2425+
tag = csa ? UNI_BSS_INFO_BCN_CSA : UNI_BSS_INFO_BCN_BCC;
24262426

24272427
tlv = mt7996_mcu_add_uni_tlv(rskb, tag, sizeof(*info));
24282428

@@ -2432,16 +2432,13 @@ mt7996_mcu_beacon_cntdwn(struct ieee80211_vif *vif, struct sk_buff *rskb,
24322432

24332433
static void
24342434
mt7996_mcu_beacon_mbss(struct sk_buff *rskb, struct sk_buff *skb,
2435-
struct ieee80211_vif *vif, struct bss_bcn_content_tlv *bcn,
2435+
struct bss_bcn_content_tlv *bcn,
24362436
struct ieee80211_mutable_offsets *offs)
24372437
{
24382438
struct bss_bcn_mbss_tlv *mbss;
24392439
const struct element *elem;
24402440
struct tlv *tlv;
24412441

2442-
if (!vif->bss_conf.bssid_indicator)
2443-
return;
2444-
24452442
tlv = mt7996_mcu_add_uni_tlv(rskb, UNI_BSS_INFO_BCN_MBSSID, sizeof(*mbss));
24462443

24472444
mbss = (struct bss_bcn_mbss_tlv *)tlv;
@@ -2484,7 +2481,8 @@ mt7996_mcu_beacon_mbss(struct sk_buff *rskb, struct sk_buff *skb,
24842481
}
24852482

24862483
static void
2487-
mt7996_mcu_beacon_cont(struct mt7996_dev *dev, struct ieee80211_vif *vif,
2484+
mt7996_mcu_beacon_cont(struct mt7996_dev *dev,
2485+
struct ieee80211_bss_conf *link_conf,
24882486
struct sk_buff *rskb, struct sk_buff *skb,
24892487
struct bss_bcn_content_tlv *bcn,
24902488
struct ieee80211_mutable_offsets *offs)
@@ -2498,9 +2496,9 @@ mt7996_mcu_beacon_cont(struct mt7996_dev *dev, struct ieee80211_vif *vif,
24982496
if (offs->cntdwn_counter_offs[0]) {
24992497
u16 offset = offs->cntdwn_counter_offs[0];
25002498

2501-
if (vif->bss_conf.csa_active)
2499+
if (link_conf->csa_active)
25022500
bcn->csa_ie_pos = cpu_to_le16(offset - 4);
2503-
if (vif->bss_conf.color_change_active)
2501+
if (link_conf->color_change_active)
25042502
bcn->bcc_ie_pos = cpu_to_le16(offset - 3);
25052503
}
25062504

@@ -2511,28 +2509,30 @@ mt7996_mcu_beacon_cont(struct mt7996_dev *dev, struct ieee80211_vif *vif,
25112509
memcpy(buf + MT_TXD_SIZE, skb->data, skb->len);
25122510
}
25132511

2514-
int mt7996_mcu_add_beacon(struct ieee80211_hw *hw,
2515-
struct ieee80211_vif *vif, int en)
2512+
int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
2513+
struct ieee80211_bss_conf *link_conf)
25162514
{
25172515
struct mt7996_dev *dev = mt7996_hw_dev(hw);
2518-
struct mt7996_phy *phy = mt7996_hw_phy(hw);
2519-
struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
2516+
struct mt76_vif_link *mlink = mt76_vif_conf_link(&dev->mt76, vif, link_conf);
25202517
struct ieee80211_mutable_offsets offs;
25212518
struct ieee80211_tx_info *info;
25222519
struct sk_buff *skb, *rskb;
25232520
struct tlv *tlv;
25242521
struct bss_bcn_content_tlv *bcn;
25252522
int len;
25262523

2527-
if (vif->bss_conf.nontransmitted)
2524+
if (link_conf->nontransmitted)
25282525
return 0;
25292526

2530-
rskb = __mt7996_mcu_alloc_bss_req(&dev->mt76, &mvif->deflink.mt76,
2527+
if (!mlink)
2528+
return -EINVAL;
2529+
2530+
rskb = __mt7996_mcu_alloc_bss_req(&dev->mt76, mlink,
25312531
MT7996_MAX_BSS_OFFLOAD_SIZE);
25322532
if (IS_ERR(rskb))
25332533
return PTR_ERR(rskb);
25342534

2535-
skb = ieee80211_beacon_get_template(hw, vif, &offs, 0);
2535+
skb = ieee80211_beacon_get_template(hw, vif, &offs, link_conf->link_id);
25362536
if (!skb) {
25372537
dev_kfree_skb(rskb);
25382538
return -EINVAL;
@@ -2546,21 +2546,22 @@ int mt7996_mcu_add_beacon(struct ieee80211_hw *hw,
25462546
}
25472547

25482548
info = IEEE80211_SKB_CB(skb);
2549-
info->hw_queue |= FIELD_PREP(MT_TX_HW_QUEUE_PHY, phy->mt76->band_idx);
2549+
info->hw_queue |= FIELD_PREP(MT_TX_HW_QUEUE_PHY, mlink->band_idx);
25502550

25512551
len = ALIGN(sizeof(*bcn) + MT_TXD_SIZE + skb->len, 4);
25522552
tlv = mt7996_mcu_add_uni_tlv(rskb, UNI_BSS_INFO_BCN_CONTENT, len);
25532553
bcn = (struct bss_bcn_content_tlv *)tlv;
2554-
bcn->enable = en;
2555-
if (!en)
2554+
bcn->enable = link_conf->enable_beacon;
2555+
if (!bcn->enable)
25562556
goto out;
25572557

2558-
mt7996_mcu_beacon_cont(dev, vif, rskb, skb, bcn, &offs);
2559-
mt7996_mcu_beacon_mbss(rskb, skb, vif, bcn, &offs);
2560-
mt7996_mcu_beacon_cntdwn(vif, rskb, skb, &offs);
2558+
mt7996_mcu_beacon_cont(dev, link_conf, rskb, skb, bcn, &offs);
2559+
if (link_conf->bssid_indicator)
2560+
mt7996_mcu_beacon_mbss(rskb, skb, bcn, &offs);
2561+
mt7996_mcu_beacon_cntdwn(rskb, skb, &offs, link_conf->csa_active);
25612562
out:
25622563
dev_kfree_skb(skb);
2563-
return mt76_mcu_skb_send_msg(&phy->dev->mt76, rskb,
2564+
return mt76_mcu_skb_send_msg(&dev->mt76, rskb,
25642565
MCU_WMWA_UNI_CMD(BSS_INFO_UPDATE), true);
25652566
}
25662567

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ int mt7996_mcu_add_rx_ba(struct mt7996_dev *dev,
534534
int mt7996_mcu_update_bss_color(struct mt7996_dev *dev, struct ieee80211_vif *vif,
535535
struct cfg80211_he_bss_color *he_bss_color);
536536
int mt7996_mcu_add_beacon(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
537-
int enable);
537+
struct ieee80211_bss_conf *link_conf);
538538
int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev,
539539
struct ieee80211_vif *vif, u32 changed);
540540
int mt7996_mcu_add_obss_spr(struct mt7996_phy *phy, struct ieee80211_vif *vif,

0 commit comments

Comments
 (0)