Commit 943aeda0 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parents 82bbe02b 0aa8496a

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

+1 −0
Original line number Diff line number Diff line
@@ -1011,6 +1011,7 @@ void mt76_dma_cleanup(struct mt76_dev *dev) 
	int i;



	mt76_worker_disable(&dev->tx_worker);

	napi_disable(&dev->tx_napi);

	netif_napi_del(&dev->tx_napi);



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

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

+2 −2
Original line number Diff line number Diff line
@@ -1924,14 +1924,14 @@ mt7925_mcu_sta_cmd(struct mt76_phy *phy, 
			mt7925_mcu_sta_mld_tlv(skb, info->vif, info->link_sta->sta);

			mt7925_mcu_sta_eht_mld_tlv(skb, info->vif, info->link_sta->sta);

		}



		mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, info->link_sta);

	}



	if (!info->enable) {

		mt7925_mcu_sta_remove_tlv(skb);

		mt76_connac_mcu_add_tlv(skb, STA_REC_MLD_OFF,

					sizeof(struct tlv));

	} else {

		mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, info->link_sta);

	}



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