From 7ea086bb8942781853a1c752f0a60ea6b68bc72c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 26 Sep 2024 15:04:54 +0200 Subject: [PATCH 1/2] mediatek: remove "Ralink" from the target name None of the supported chips have been sold under the Ralink brand. Signed-off-by: Felix Fietkau --- target/linux/mediatek/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/Makefile b/target/linux/mediatek/Makefile index f667081253d3fd..711cda0791899e 100644 --- a/target/linux/mediatek/Makefile +++ b/target/linux/mediatek/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=mediatek -BOARDNAME:=MediaTek Ralink ARM +BOARDNAME:=MediaTek ARM SUBTARGETS:=mt7622 mt7623 mt7629 filogic FEATURES:=dt-overlay emmc fpu gpio nand pci pcie rootfs-part separate_ramdisk squashfs usb From 9c413397d99dbd66739ffb1f89d00a74dfbfe45a Mon Sep 17 00:00:00 2001 From: Mieczyslaw Nalewaj Date: Thu, 26 Sep 2024 21:34:07 +0200 Subject: [PATCH 2/2] ath79: Refresh kernel patches Make the patches apply cleanly again. Fixes: 774badd8a840 ("kernel: fix crashes after linearizing fraglist GSO skbs") Signed-off-by: Mieczyslaw Nalewaj Link: https://github.com/openwrt/openwrt/pull/16517 Signed-off-by: Robert Marko --- .../linux/ath79/patches-6.6/900-unaligned_access_hacks.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch index 46811ab21ca27b..720c3bfcddcc9d 100644 --- a/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch @@ -867,7 +867,7 @@ SVN-Revision: 35130 iph->daddr == iph2->daddr && iph->saddr == iph2->saddr) return segs; -@@ -258,7 +258,7 @@ struct sk_buff *tcp_gro_lookup(struct li +@@ -264,7 +264,7 @@ struct sk_buff *tcp_gro_lookup(struct li continue; th2 = tcp_hdr(p); @@ -876,7 +876,7 @@ SVN-Revision: 35130 NAPI_GRO_CB(p)->same_flow = 0; continue; } -@@ -324,8 +324,8 @@ struct sk_buff *tcp_gro_receive(struct l +@@ -330,8 +330,8 @@ struct sk_buff *tcp_gro_receive(struct l ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH)); flush |= (__force int)(th->ack_seq ^ th2->ack_seq); for (i = sizeof(*th); i < thlen; i += 4)