kernel: bump 5.4 to 5.4.165

[openwrt/staging/mkresin.git] / target / linux / layerscape / patches-5.4 / 701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch b/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
index 2df6afb20b6541c5675ddf1f1b8f708e3afb98d8..a6bbdd67fe50da6448048bf94b371dbfd4ade541 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mscc/ocelot.c
 +++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -2135,6 +2135,28 @@ static int ocelot_init_timestamp(struct
+@@ -2132,6 +2132,28 @@ static int ocelot_init_timestamp(struct
        return 0;
  }
  
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  int ocelot_probe_port(struct ocelot *ocelot, u8 port,
                      void __iomem *regs,
                      struct phy_device *phy)
-@@ -2142,7 +2164,6 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2139,7 +2161,6 @@ int ocelot_probe_port(struct ocelot *oce
        struct ocelot_port_private *priv;
        struct ocelot_port *ocelot_port;
        struct net_device *dev;
@@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int err;
  
        dev = alloc_etherdev(sizeof(struct ocelot_port_private));
-@@ -2170,32 +2191,14 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2167,32 +2188,14 @@ int ocelot_probe_port(struct ocelot *oce
        ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, ocelot_port->pvid,
                          ENTRYTYPE_LOCKED);