kernel: bump 5.4 to 5.4.165

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch b/target/linux/layerscape/patches-5.4/701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch
index bb34e5db2cf5865f92aab56402d286a670f0dda1..f3db7da458cd2f45b479b1bf72433bd53893a19f 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0238-net-mscc-ocelot-break-apart-ocelot_vlan_port_apply.patch
@@ -226,7 +226,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        return 0;
  }
-@@ -1306,6 +1331,7 @@ static int ocelot_port_attr_set(struct n
+@@ -1303,6 +1328,7 @@ static int ocelot_port_attr_set(struct n
                                struct switchdev_trans *trans)
  {
        struct ocelot_port *ocelot_port = netdev_priv(dev);
@@ -234,7 +234,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int err = 0;
  
        switch (attr->id) {
-@@ -1317,8 +1343,8 @@ static int ocelot_port_attr_set(struct n
+@@ -1314,8 +1340,8 @@ static int ocelot_port_attr_set(struct n
                ocelot_port_attr_ageing_set(ocelot_port, attr->u.ageing_time);
                break;
        case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:
@@ -245,7 +245,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                break;
        case SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED:
                ocelot_port_attr_mc_set(ocelot_port, !attr->u.mc_disabled);
-@@ -1520,20 +1546,20 @@ static int ocelot_port_bridge_join(struc
+@@ -1517,20 +1543,20 @@ static int ocelot_port_bridge_join(struc
        return 0;
  }
  
@@ -273,7 +273,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
-@@ -1687,11 +1713,8 @@ static int ocelot_netdevice_port_event(s
+@@ -1684,11 +1710,8 @@ static int ocelot_netdevice_port_event(s
                                err = ocelot_port_bridge_join(ocelot_port,
                                                              info->upper_dev);
                        else
@@ -287,7 +287,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                }
                if (netif_is_lag_master(info->upper_dev)) {
                        if (info->linking)
-@@ -2009,6 +2032,7 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2006,6 +2029,7 @@ int ocelot_probe_port(struct ocelot *oce
  {
        struct ocelot_port *ocelot_port;
        struct net_device *dev;
@@ -295,7 +295,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int err;
  
        dev = alloc_etherdev(sizeof(struct ocelot_port));
-@@ -2044,7 +2068,15 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2041,7 +2065,15 @@ int ocelot_probe_port(struct ocelot *oce
        }
  
        /* Basic L2 initialization */