Skip to content

Commit 943aeda

Browse files
committed
Merge tag 'mt76-fixes-2025-05-15' of https://github.com/nbd168/wireless
Felix Fietkau says: =================== mt76 fix for 6.15 - disable napi on driver removal to fix warning - fix multicast rx regression on mt7925 =================== Link: https://patch.msgid.link/3b526d06-b717-4d47-817c-a9f47b796a31@nbd.name/ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2 parents 82bbe02 + 0aa8496 commit 943aeda

File tree

2 files changed

+3
-2
lines changed
  • drivers/net/wireless/mediatek/mt76

2 files changed

+3
-2
lines changed

drivers/net/wireless/mediatek/mt76/dma.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,7 @@ void mt76_dma_cleanup(struct mt76_dev *dev)
10111011
int i;
10121012

10131013
mt76_worker_disable(&dev->tx_worker);
1014+
napi_disable(&dev->tx_napi);
10141015
netif_napi_del(&dev->tx_napi);
10151016

10161017
for (i = 0; i < ARRAY_SIZE(dev->phys); i++) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,14 +1924,14 @@ mt7925_mcu_sta_cmd(struct mt76_phy *phy,
19241924
mt7925_mcu_sta_mld_tlv(skb, info->vif, info->link_sta->sta);
19251925
mt7925_mcu_sta_eht_mld_tlv(skb, info->vif, info->link_sta->sta);
19261926
}
1927-
1928-
mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, info->link_sta);
19291927
}
19301928

19311929
if (!info->enable) {
19321930
mt7925_mcu_sta_remove_tlv(skb);
19331931
mt76_connac_mcu_add_tlv(skb, STA_REC_MLD_OFF,
19341932
sizeof(struct tlv));
1933+
} else {
1934+
mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, info->link_sta);
19351935
}
19361936

19371937
return mt76_mcu_skb_send_msg(dev, skb, info->cmd, true);

0 commit comments

Comments
 (0)