Commit 3933536c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2025-05-15' of... 

Merge tag 'wireless-2025-05-15' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless

Johannes Berg says:

====================
Couple of stragglers:
 - mac80211: fix syzbot/ubsan in scan counted-by
 - mt76: fix NAPI handling on driver remove
 - mt67: fix multicast/ipv6 receive

* tag 'wireless-2025-05-15' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: mac80211: Set n_channels after allocating struct cfg80211_scan_request
  wifi: mt76: mt7925: fix missing hdr_trans_tlv command for broadcast wtbl
  wifi: mt76: disable napi on driver removal
====================

Link: https://patch.msgid.link/20250515121749.61912-4-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 325eb217 943aeda0

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);

net/mac80211/main.c

+4 −2
Original line number Diff line number Diff line
@@ -1354,10 +1354,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
	hw->wiphy->software_iftypes |= BIT(NL80211_IFTYPE_MONITOR);





	local->int_scan_req = kzalloc(sizeof(*local->int_scan_req) +

				      sizeof(void *) * channels, GFP_KERNEL);

	local->int_scan_req = kzalloc(struct_size(local->int_scan_req,

						  channels, channels),

				      GFP_KERNEL);

	if (!local->int_scan_req)

		return -ENOMEM;

	local->int_scan_req->n_channels = channels;



	eth_broadcast_addr(local->int_scan_req->bssid);