Merge branch 'rmandrad:main' into main

N-Storm · Oct 1, 2024 · 7ba16cb · 7ba16cb
2 parents 90794bb + c78c71a
commit 7ba16cb
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 2 deletions.
diff --git a/...patches/subsys/400-allow-ibss-mixed.patch → ...patches/subsys/220-allow-ibss-mixed.patch b/...patches/subsys/400-allow-ibss-mixed.patch → ...patches/subsys/220-allow-ibss-mixed.patch
diff --git a/...sys/780-avoid-crashing-missing-band.patch → ...sys/230-avoid-crashing-missing-band.patch b/...sys/780-avoid-crashing-missing-band.patch → ...sys/230-avoid-crashing-missing-band.patch
@@ -18,7 +18,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/net/mac80211/sta_info.c
 +++ b/net/mac80211/sta_info.c
-@@ -2455,6 +2455,13 @@ static void sta_stats_decode_rate(struct
+@@ -2439,6 +2439,13 @@ static void sta_stats_decode_rate(struct
 
  		sband = local->hw.wiphy->bands[band];
 

diff --git a/...ace-period-for-DFS-available-after-.patch → ...ace-period-for-DFS-available-after-.patch b/...ace-period-for-DFS-available-after-.patch → ...ace-period-for-DFS-available-after-.patch
diff --git a/...d-AQL-support-for-broadcast-packets.patch → ...d-AQL-support-for-broadcast-packets.patch b/...d-AQL-support-for-broadcast-packets.patch → ...d-AQL-support-for-broadcast-packets.patch
diff --git a/...roduce-EHT-rate-support-in-AQL-airt.patch → ...roduce-EHT-rate-support-in-AQL-airt.patch b/...roduce-EHT-rate-support-in-AQL-airt.patch → ...roduce-EHT-rate-support-in-AQL-airt.patch
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
@@ -661,6 +661,7 @@ define KernelPackage/mt7992-firmware/install
 	cp \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_dsp.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom.bin \
+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_2i5i.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm.bin \
@@ -672,7 +673,7 @@ define KernelPackage/mt7992-23-firmware/install
 	cp \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_dsp_23.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23.bin \
-		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23.bin \
+		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_eeprom_23_2i5i.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch_23.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa_23.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm_23.bin \

diff --git a/tools/elfutils/patches/100-portability.patch b/tools/elfutils/patches/100-portability.patch
@@ -288,3 +288,13 @@
 
  /* Definitions of arguments for argp functions.  */
  static const struct argp_option options[] =
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -92,6 +92,7 @@ strings_LDADD = $(libelf) $(libeu) $(arg
+ ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(obstack_LIBS)
+ unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
+ stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(demanglelib)
++EXTRA_stack_DEPENDENCIES = $(if $(findstring srcfiles,$(bin_PROGRAMS)),$(srcfiles_OBJECTS))
+ elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
+ elfclassify_LDADD = $(libelf) $(libdw) $(libeu) $(argp_LDADD)
+ srcfiles_SOURCES = srcfiles.cxx