aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2023-08-26 02:19:18 +0100
committerDaniel Golle <daniel@makrotopia.org>2023-09-04 23:00:34 +0100
commit625d19c1e2d0aebcd69b73062afc76ae9f4456b4 (patch)
treee53ea91535d69109871be407a7c505d9a8927862 /target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch
parent230c09d2034995540aaec920466eb25387173e56 (diff)
downloadupstream-625d19c1e2d0aebcd69b73062afc76ae9f4456b4.tar.gz
upstream-625d19c1e2d0aebcd69b73062afc76ae9f4456b4.tar.bz2
upstream-625d19c1e2d0aebcd69b73062afc76ae9f4456b4.zip
generic: sync MediaTek Ethernet driver with upstream
Import commits from upstream Linux replacing some downstream patches. Move accepted patches from pending-{5.15,6.1} to backport-{5.15,6.1}. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit f631c7bbb16f1d39d59c4cdf3f7189abab4fd9c6)
Diffstat (limited to 'target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch')
-rw-r--r--target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch b/target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch
index 6ebd1abcd0..f9d822ad44 100644
--- a/target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch
+++ b/target/linux/generic/backport-5.15/730-09-v6.3-net-ethernet-mtk_eth_soc-fix-VLAN-rx-hardware-accele.patch
@@ -181,7 +181,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* CDMP Ingress Control Register */
#define MTK_CDMP_IG_CTRL 0x400
#define MTK_CDMP_STAG_EN BIT(0)
-@@ -1166,6 +1172,8 @@ struct mtk_eth {
+@@ -1160,6 +1166,8 @@ struct mtk_eth {
int ip_align;