kernel: bump 5.4 to 5.4.142

[openwrt/openwrt.git] / target / linux / generic / backport-5.4 / 753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch

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 eea9bf28d1d15f308874b50df5ae0ec7039c1b83..98d213ee6ef7ce34dc7cc049bc6b634d2e8415d7 100644 (file)
--- 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;