diff options
author | Petr Štetiar <ynezz@true.cz> | 2020-04-07 10:08:16 +0200 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-04-09 00:12:46 +0200 |
commit | b299002877c801202c3b61d5e09865e88f506176 (patch) | |
tree | cf1d30e16b53a53e4d04630527f67b01eac38181 /target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch | |
parent | 196cab719f8f318ec771e5f1a07728c12b7fa207 (diff) | |
download | upstream-b299002877c801202c3b61d5e09865e88f506176.tar.gz upstream-b299002877c801202c3b61d5e09865e88f506176.tar.bz2 upstream-b299002877c801202c3b61d5e09865e88f506176.zip |
kernel: bump 5.4 to 5.4.31
Refreshed patches, removed upstreamed patches:
oxnas: 003-ARM-dts-oxnas-Fix-clear-mask-property.patch
generic: 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch
Run tested: apu2, qemu-x86-64, apalis
Build tested: sunxi/a53, imx6, x86/64, ipq40xx
Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
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.patch | 8 |
1 files changed, 4 insertions, 4 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 39e351e279..4185547264 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 -@@ -1222,6 +1222,64 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port, +@@ -1222,6 +1222,64 @@ mt7530_port_vlan_del(struct dsa_switch * return 0; } @@ -80,9 +80,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> +} + static enum dsa_tag_protocol - mtk_get_tag_protocol(struct dsa_switch *ds, int port, - enum dsa_tag_protocol mp) -@@ -1613,6 +1671,8 @@ static const struct dsa_switch_ops mt7530_switch_ops = { + mtk_get_tag_protocol(struct dsa_switch *ds, int port) + { +@@ -1606,6 +1664,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, |