kernel: bump 5.4 to 5.4.165

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch b/target/linux/layerscape/patches-5.4/701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch
index 2e05090c7c29ca86ca8ed4065e218f130490eed6..8850f571035ca7151eb9639715a5f6391c0f8760 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0243-net-mscc-ocelot-refactor-struct-ocelot_port-out-of-f.patch
@@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        return 0;
  }
-@@ -1586,11 +1586,9 @@ static int ocelot_port_obj_del(struct ne
+@@ -1583,11 +1583,9 @@ static int ocelot_port_obj_del(struct ne
        return ret;
  }
  
@@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (!ocelot->bridge_mask) {
                ocelot->hw_bridge_dev = bridge;
        } else {
-@@ -1600,17 +1598,14 @@ static int ocelot_port_bridge_join(struc
+@@ -1597,17 +1595,14 @@ static int ocelot_port_bridge_join(struc
                        return -ENODEV;
        }
  
@@ -116,7 +116,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        ocelot->bridge_mask &= ~BIT(port);
  
        if (!ocelot->bridge_mask)
-@@ -1679,14 +1674,12 @@ static void ocelot_setup_lag(struct ocel
+@@ -1676,14 +1671,12 @@ static void ocelot_setup_lag(struct ocel
        }
  }
  
@@ -133,7 +133,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        rcu_read_lock();
        for_each_netdev_in_bond_rcu(bond, ndev) {
-@@ -1701,17 +1694,17 @@ static int ocelot_port_lag_join(struct o
+@@ -1698,17 +1691,17 @@ static int ocelot_port_lag_join(struct o
        /* If the new port is the lowest one, use it as the logical port from
         * now on
         */
@@ -156,7 +156,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
  
        ocelot_setup_lag(ocelot, lag);
-@@ -1720,34 +1713,32 @@ static int ocelot_port_lag_join(struct o
+@@ -1717,34 +1710,32 @@ static int ocelot_port_lag_join(struct o
        return 0;
  }
  
@@ -200,7 +200,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        ocelot_set_aggr_pgids(ocelot);
  }
-@@ -1763,24 +1754,26 @@ static int ocelot_netdevice_port_event(s
+@@ -1760,24 +1751,26 @@ static int ocelot_netdevice_port_event(s
                                       struct netdev_notifier_changeupper_info *info)
  {
        struct ocelot_port *ocelot_port = netdev_priv(dev);
@@ -231,7 +231,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                                      info->upper_dev);
                }
                break;
-@@ -2138,7 +2131,7 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2135,7 +2128,7 @@ int ocelot_probe_port(struct ocelot *oce
                       REW_PORT_VLAN_CFG, port);
  
        /* Enable vcap lookups */