aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-06-03 14:46:59 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-06 00:25:25 +0200
commit752cd29904c9304125005b34354b75b968bfc449 (patch)
treed3ae84605ec5662eb77b49e7886971c61c0dfb48 /target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch
parentda77b9c2f185db72a2917aa2e18f0c8bb164d3c4 (diff)
downloadupstream-752cd29904c9304125005b34354b75b968bfc449.tar.gz
upstream-752cd29904c9304125005b34354b75b968bfc449.tar.bz2
upstream-752cd29904c9304125005b34354b75b968bfc449.zip
kernel: bump 5.4 to 5.4.124
Manually rebased: generic/hack-5.4/662-remove_pfifo_fast.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [manual changes to ramips/patches-5.10/835-asoc-add-mt7620-support.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch')
-rw-r--r--target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch b/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch
index e788118259..d4e6f8664d 100644
--- a/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch
+++ b/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
-@@ -1153,6 +1153,64 @@ mt7530_port_vlan_del(struct dsa_switch *
+@@ -1145,6 +1145,64 @@ mt7530_port_vlan_del(struct dsa_switch *
return 0;
}
@@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static enum dsa_tag_protocol
mtk_get_tag_protocol(struct dsa_switch *ds, int port)
{
-@@ -1530,6 +1588,8 @@ static const struct dsa_switch_ops mt753
+@@ -1522,6 +1580,8 @@ static const struct dsa_switch_ops mt753
.port_vlan_prepare = mt7530_port_vlan_prepare,
.port_vlan_add = mt7530_port_vlan_add,
.port_vlan_del = mt7530_port_vlan_del,