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-09-04 19:54:35 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-09-13 17:08:17 +0200
commit51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a (patch)
tree3f9a794b168378c834694ac44047462738c8807d /target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch
parent5fb4cb07e24655a45cc489d03f85ca813eb093a0 (diff)
downloadupstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.tar.gz
upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.tar.bz2
upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.zip
kernel: bump 5.4 to 5.4.144
Manually rebased: backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 Signed-off-by: John Audia <graysky@archlinux.us>
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 14bf827806..71a06997c3 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
-@@ -1146,6 +1146,64 @@ mt7530_port_vlan_del(struct dsa_switch *
+@@ -1143,6 +1143,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)
{
-@@ -1523,6 +1581,8 @@ static const struct dsa_switch_ops mt753
+@@ -1520,6 +1578,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,