diff options
author | John Audia <graysky@archlinux.us> | 2021-08-18 08:06:08 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-08-21 15:59:39 +0200 |
commit | f25cebc43c18967671dfe53f9bc8bf26613b1143 (patch) | |
tree | 8d34b738e8f89e52ed74a4b7e1aab922fec3fca9 /target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch | |
parent | 96369a68e737f05c00e1d76ec382b28d3a2d309b (diff) | |
download | upstream-f25cebc43c18967671dfe53f9bc8bf26613b1143.tar.gz upstream-f25cebc43c18967671dfe53f9bc8bf26613b1143.tar.bz2 upstream-f25cebc43c18967671dfe53f9bc8bf26613b1143.zip |
kernel: bump 5.4 to 5.4.142
Removed upstreamed:
hack-5.4/991-platform-x86-pcengines-apuv2-revert-simswitch.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>
Diffstat (limited to 'target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch')
-rw-r--r-- | target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch b/target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch index eea9bf28d1..98d213ee6e 100644 --- a/target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch +++ b/target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch @@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -1085,12 +1085,6 @@ mt7530_port_vlan_add(struct dsa_switch * +@@ -1086,12 +1086,6 @@ mt7530_port_vlan_add(struct dsa_switch * struct mt7530_priv *priv = ds->priv; u16 vid; @@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mutex_lock(&priv->reg_mutex); for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid) { -@@ -1116,12 +1110,6 @@ mt7530_port_vlan_del(struct dsa_switch * +@@ -1117,12 +1111,6 @@ mt7530_port_vlan_del(struct dsa_switch * struct mt7530_priv *priv = ds->priv; u16 vid, pvid; @@ -41,7 +41,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mutex_lock(&priv->reg_mutex); pvid = priv->ports[port].pvid; -@@ -1234,6 +1222,7 @@ mt7530_setup(struct dsa_switch *ds) +@@ -1235,6 +1223,7 @@ mt7530_setup(struct dsa_switch *ds) * as two netdev instances. */ dn = ds->ports[MT7530_CPU_PORT].master->dev.of_node->parent; |