aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-04-21 11:09:30 +0200
committerPetr Štetiar <ynezz@true.cz>2020-04-21 22:16:33 +0200
commitfaf668be354af76b8b9f93921b426dc5e9782a98 (patch)
treedadddb8dbaa2d6a825cbdfab5cb0015d17c91f91 /target/linux/generic/backport-5.4
parent8d9b36270b1faecdf8c9632e0f18251df9a0990c (diff)
downloadupstream-faf668be354af76b8b9f93921b426dc5e9782a98.tar.gz
upstream-faf668be354af76b8b9f93921b426dc5e9782a98.tar.bz2
upstream-faf668be354af76b8b9f93921b426dc5e9782a98.zip
kernel: bump 5.4 to 5.4.34
Refreshed patches. Run tested: qemu-x86-64, apalis, a64-olinuxino Build tested: x86/64, imx6, sunxi/a53 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/generic/backport-5.4')
-rw-r--r--target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch6
1 files changed, 3 insertions, 3 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 acd09013af..4dadb517a3 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 *
+@@ -1151,6 +1151,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)
{
-@@ -1609,6 +1667,8 @@ static const struct dsa_switch_ops mt753
+@@ -1530,6 +1588,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,
@@ -112,7 +112,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#define PORT_VLAN(x) ((x) & 0x3)
enum mt7530_port_mode {
-@@ -460,6 +465,8 @@ struct mt7530_priv {
+@@ -457,6 +462,8 @@ struct mt7530_priv {
phy_interface_t p6_interface;
phy_interface_t p5_interface;
unsigned int p5_intf_sel;