From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 10 Jul 2025 17:08:47 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cad34fb7c5d12a9b61862744e7130e9ce3bc58f;p=thirdparty%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.16-rc6-2).

No conflicts.

Adjacent changes:

drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
  c701574c5412 ("wifi: mt76: mt7925: fix invalid array index in ssid assignment during hw scan")
  b3a431fe2e39 ("wifi: mt76: mt7925: fix off by one in mt7925_mcu_hw_scan()")

drivers/net/wireless/mediatek/mt76/mt7996/mac.c
  62da647a2b20 ("wifi: mt76: mt7996: Add MLO support to mt7996_tx_check_aggr()")
  dc66a129adf1 ("wifi: mt76: add a wrapper for wcid access with validation")

drivers/net/wireless/mediatek/mt76/mt7996/main.c
  3dd6f67c669c ("wifi: mt76: Move RCU section in mt7996_mcu_add_rate_ctrl()")
  8989d8e90f5f ("wifi: mt76: mt7996: Do not set wcid.sta to 1 in mt7996_mac_sta_event()")

net/mac80211/cfg.c
  58fcb1b4287c ("wifi: mac80211: reject VHT opmode for unsupported channel widths")
  037dc18ac3fb ("wifi: mac80211: add support for storing station S1G capabilities")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

0cad34fb7c5d12a9b61862744e7130e9ce3bc58f
diff --cc drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 16f3cc58a192e,8ac6fbb736ab8..300c863f0e3e2
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@@ -2866,11 -2916,11 +2916,11 @@@ int mt7925_mcu_hw_scan(struct mt76_phy 
  	for (i = 0; i < sreq->n_ssids; i++) {
  		if (!sreq->ssids[i].ssid_len)
  			continue;
 -		if (i > MT7925_RNR_SCAN_MAX_BSSIDS)
 +		if (i >= MT7925_RNR_SCAN_MAX_BSSIDS)
  			break;
  
- 		ssid->ssids[i].ssid_len = cpu_to_le32(sreq->ssids[i].ssid_len);
- 		memcpy(ssid->ssids[i].ssid, sreq->ssids[i].ssid,
+ 		ssid->ssids[n_ssids].ssid_len = cpu_to_le32(sreq->ssids[i].ssid_len);
+ 		memcpy(ssid->ssids[n_ssids].ssid, sreq->ssids[i].ssid,
  		       sreq->ssids[i].ssid_len);
  		n_ssids++;
  	}