Merge branch 'openwrt:main' into main

Author: small-white-rabbit

package/kernel/mac80211/patches/rt2x00/602-04-wifi-rt2x00-Support-EEPROM-swap-binding.patch

@@ -21,27 +21,15 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 
 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
-@@ -15,10 +15,10 @@
+@@ -15,6 +15,7 @@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
  #endif
 +#include <linux/nvmem-consumer.h>
 
  #include "rt2x00.h"
 
--#if IS_ENABLED(CONFIG_MTD)
- static void rt2800lib_eeprom_swap(struct rt2x00_dev *rt2x00dev)
- {
- 	struct device_node *np = rt2x00dev->dev->of_node;
-@@ -32,6 +32,7 @@ static void rt2800lib_eeprom_swap(struct
- 		rt2x00dev->eeprom[i] = swab16(rt2x00dev->eeprom[i]);
- }
- 
-+#if IS_ENABLED(CONFIG_MTD)
- static int rt2800lib_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
- {
- 	struct device_node *np = rt2x00dev->dev->of_node, *mtd_np = NULL;
-@@ -85,6 +86,40 @@ static int rt2800lib_read_eeprom_mtd(str
+@@ -70,6 +71,38 @@ static int rt2800lib_read_eeprom_mtd(str
  }
  #endif
 
@@ -72,8 +60,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 +
 +	memcpy(rt2x00dev->eeprom, data, len);
 +
-+	rt2800lib_eeprom_swap(rt2x00dev);
-+
 +exit:
 +	kfree(data);
 +	return ret;
@@ -82,7 +68,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  static const char *
  rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
  {
-@@ -152,6 +187,10 @@ int rt2x00lib_read_eeprom(struct rt2x00_
+@@ -137,6 +170,10 @@ int rt2x00lib_read_eeprom(struct rt2x00_
  		return 0;
  #endif
 

package/kernel/mac80211/patches/rt2x00/602-05-wifi-rt2x00-support-loading-eeprom-from-NVMEM-cells.patch

@@ -35,9 +35,9 @@ Signed-off-by: Coia Prant <coiaprant@gmail.com>
 
 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
-@@ -32,6 +32,27 @@ static void rt2800lib_eeprom_swap(struct
- 		rt2x00dev->eeprom[i] = swab16(rt2x00dev->eeprom[i]);
- }
+@@ -19,6 +19,27 @@
+ 
+ #include "rt2x00.h"
 
 +static int rt2800lib_read_eeprom_data(struct rt2x00_dev *rt2x00dev)
 +{
@@ -63,7 +63,7 @@ Signed-off-by: Coia Prant <coiaprant@gmail.com>
  #if IS_ENABLED(CONFIG_MTD)
  static int rt2800lib_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
  {
-@@ -181,6 +202,10 @@ int rt2x00lib_read_eeprom(struct rt2x00_
+@@ -164,6 +185,10 @@ int rt2x00lib_read_eeprom(struct rt2x00_
  {
  	int ret;
 

package/kernel/mac80211/patches/rt2x00/603-wifi-rt2x00-Add-support-for-loading-EEPROM-from-devicetree-embedded-data.patch

@@ -0,0 +1,33 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Wed, 18 Mar 2026 20:01:16 +0000
+Subject: [PATCH] mac80211: report assoc_link_id in station info for non-MLD
+ STAs on MLD AP
+
+When a non-MLD station associates with an MLD AP, it does so on a
+specific link. However, sta_set_sinfo() never sets mlo_params_valid,
+so nl80211 never emits NL80211_ATTR_MLO_LINK_ID in get_station /
+dump_station responses. Userspace has no way to determine which link
+a non-MLD STA is associated on.
+
+Set mlo_params_valid to 1 and assoc_link_id to sta->deflink.link_id,
+when valid_links is set.
+Also set the mld_addr copy only for MLD STAs, so that non-MLD STAs
+get a zeroed mld_addr as documented.
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -3252,7 +3252,10 @@ void sta_set_sinfo(struct sta_info *sta,
+ 		struct link_sta_info *link_sta;
+ 		int link_id;
+ 
+-		ether_addr_copy(sinfo->mld_addr, sta->addr);
++		sinfo->mlo_params_valid = true;
++		sinfo->assoc_link_id = sta->deflink.link_id;
++		if (sta->sta.mlo)
++			ether_addr_copy(sinfo->mld_addr, sta->addr);
+ 
+ 		/* assign valid links first for iteration */
+ 		sinfo->valid_links = sta->sta.valid_links;

package/kernel/mac80211/patches/subsys/380-mac80211-report-assoc_link_id-in-station-info-for-no.patch

@@ -1,16 +1,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mt76
-PKG_RELEASE=2
+PKG_RELEASE=1
 
 PKG_LICENSE:=BSD-3-Clause-Clear
 PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2026-03-05
-PKG_SOURCE_VERSION:=9f95baf93a070692ed922a2fc57ef8bfde801c84
-PKG_MIRROR_HASH:=eaca371ec6f8d0f089d098a3f7fc8c5819aea090e05f4f3d9e8a9b2a2d4f2ff8
+PKG_SOURCE_DATE:=2026-03-19
+PKG_SOURCE_VERSION:=39c960c3ada558b4c2e7915772483d3731573d09
+PKG_MIRROR_HASH:=7a9f8ea21eee5324e6638ace627dd305b3650ae6ca86109317d9ee83702140eb
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_USE_NINJA:=0

package/kernel/mt76/Makefile

@@ -354,10 +354,10 @@ function device_htmode_append(config) {
 			config.vht_capab += '[BF-ANTENNA-' + min(((vht_capab >> 13) & 3) + 1, config.beamformer_antennas) + ']';
 
 		/* supported Channel widths */
-		if (((vht_capab & 0xc) == 4 || (vht_capab & 0xc) == 8) && config.vht160 >= 1)
-			config.vht_capab += '[VHT160]';
 		if ((vht_capab & 0xc) == 8 && config.vht160 >= 2)
 			config.vht_capab += '[VHT160-80PLUS80]';
+		else if (((vht_capab & 0xc) == 4 || (vht_capab & 0xc) == 8) && config.vht160 >= 1)
+			config.vht_capab += '[VHT160]';
 
 		/* maximum MPDU length */
 		if ((vht_capab & 3) > 1 && config.vht_max_mpdu >= 11454)

package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc

@@ -1212,6 +1212,9 @@ hostapd_rrm_beacon_req(struct ubus_context *ctx, struct ubus_object *obj,
 	if (tb[BEACON_REQ_REPORTING_DETAIL])
 		reporting_detail = blobmsg_get_u32(tb[BEACON_REQ_REPORTING_DETAIL]);
 
+	if (reporting_detail >= 0 && reporting_detail < 3)
+		buf_len += 3;
+
 	req = wpabuf_alloc(buf_len);
 	if (!req)
 		return UBUS_STATUS_UNKNOWN_ERROR;
@@ -1245,7 +1248,7 @@ hostapd_rrm_beacon_req(struct ubus_context *ctx, struct ubus_object *obj,
 		/* as per 9-104 */
 		wpabuf_put_u8(req, 2);
 		wpabuf_put_u8(req, 1);
-		wpabuf_put_le16(req, reporting_detail);
+		wpabuf_put_u8(req, reporting_detail);
 	}
 
 	ret = hostapd_send_beacon_req(hapd, addr, 0, req);
@@ -2016,6 +2019,7 @@ void hostapd_ubus_notify_beacon_report(
 
 	blob_buf_init(&b, 0);
 	blobmsg_add_macaddr(&b, "address", addr);
+	blobmsg_add_u32(&b, "token", token);
 	blobmsg_add_u16(&b, "op-class", rep->op_class);
 	blobmsg_add_u16(&b, "channel", rep->channel);
 	blobmsg_add_u64(&b, "start-time", rep->start_time);
@@ -2025,7 +2029,7 @@ void hostapd_ubus_notify_beacon_report(
 	blobmsg_add_u16(&b, "rsni", rep->rsni);
 	blobmsg_add_macaddr(&b, "bssid", rep->bssid);
 	blobmsg_add_u16(&b, "antenna-id", rep->antenna_id);
-	blobmsg_add_u16(&b, "parent-tsf", rep->parent_tsf);
+	blobmsg_add_u32(&b, "parent-tsf", rep->parent_tsf);
 	blobmsg_add_u16(&b, "rep-mode", rep_mode);
 	encoded = base64_encode(rep, len, NULL);
 	if (encoded) {
@@ -2090,9 +2094,9 @@ void hostapd_ubus_notify_bss_transition_response(
 
 	blob_buf_init(&b, 0);
 	blobmsg_add_macaddr(&b, "address", addr);
-	blobmsg_add_u8(&b, "dialog-token", dialog_token);
-	blobmsg_add_u8(&b, "status-code", status_code);
-	blobmsg_add_u8(&b, "bss-termination-delay", bss_termination_delay);
+	blobmsg_add_u32(&b, "dialog-token", dialog_token);
+	blobmsg_add_u32(&b, "status-code", status_code);
+	blobmsg_add_u32(&b, "bss-termination-delay", bss_termination_delay);
 	if (target_bssid)
 		blobmsg_add_macaddr(&b, "target-bssid", target_bssid);
 
@@ -2119,8 +2123,8 @@ int hostapd_ubus_notify_bss_transition_query(
 
 	blob_buf_init(&b, 0);
 	blobmsg_add_macaddr(&b, "address", addr);
-	blobmsg_add_u8(&b, "dialog-token", dialog_token);
-	blobmsg_add_u8(&b, "reason", reason);
+	blobmsg_add_u32(&b, "dialog-token", dialog_token);
+	blobmsg_add_u32(&b, "reason", reason);
 	hostapd_ubus_notify_bss_transition_add_candidate_list(candidate_list, candidate_list_len);
 
 	if (!hapd->ubus.notify_response) {

package/network/services/hostapd/src/src/ap/ubus.c

@@ -156,6 +156,10 @@
 						reg = <0x16 0x6>;
 						#nvmem-cell-cells = <1>;
 					};
+
+					eeprom_boardconfig_410: eeprom@410 {
+						reg = <0x410 0x200>;
+					};
 				};
 			};
 		};
@@ -174,9 +178,7 @@
 	wifi@e,0 {
 		compatible = "pci1814,3592";
 		reg = <0x7000 0 0 0 0>;
-		ralink,mtd-eeprom = <&boardconfig 0x410>;
-		ralink,eeprom-swap;
-		nvmem-cells = <&macaddr_boardconfig_16 1>;
-		nvmem-cell-names = "mac-address";
+		nvmem-cells = <&eeprom_boardconfig_410>, <&macaddr_boardconfig_16 1>;
+		nvmem-cell-names = "eeprom", "mac-address";
 	};
 };

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts

@@ -162,6 +162,10 @@
 					macaddr_boardconfig_16: macaddr@16 {
 						reg = <0x16 0x6>;
 					};
+
+					eeprom_boardconfig_410: eeprom@410 {
+						reg = <0x410 0x200>;
+					};
 				};
 			};
 		};
@@ -187,8 +191,8 @@
 	wifi@e,0 {
 		compatible = "pci1814,3592";
 		reg = <0x7000 0 0 0 0>;
-		ralink,mtd-eeprom = <&boardconfig 0x410>;
-		ralink,eeprom-swap;
+		nvmem-cells = <&eeprom_boardconfig_410>;
+		nvmem-cell-names = "eeprom";
 	};
 };
 

target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts

@@ -194,6 +194,10 @@
 						reg = <0x16 0x6>;
 						#nvmem-cell-cells = <1>;
 					};
+
+					eeprom_boardconfig_410: eeprom@410 {
+						reg = <0x410 0x200>;
+					};
 				};
 			};
 		};
@@ -211,10 +215,10 @@
 	req-mask = <0xf>;
 
 	wifi@e,0 {
-		compatible = "pci0,0";
+		compatible = "pci1814,0601";
 		reg = <0x7000 0 0 0 0>;
-		ralink,mtd-eeprom = <&boardconfig 0x410>;
-		ralink,eeprom-swap;
+		nvmem-cells = <&eeprom_boardconfig_410>;
+		nvmem-cell-names = "eeprom";
 	};
 };