diff options
| author | John Audia <graysky@archlinux.us> | 2021-12-15 06:20:33 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-12-17 15:10:22 +0100 |
| commit | a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01 (patch) | |
| tree | 2db37701195be5e689e0480a6de94fb0fd528d8e /target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch | |
| parent | 87def9efd8cee66da3bd3961671e580282427c2e (diff) | |
| download | upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.tar.gz upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.tar.bz2 upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.zip | |
kernel: bump 5.4 to 5.4.165
All patches automatically rebased.
Build system: x86_64
Build-tested: ramips/mt7621*
*FS#4149 affects me so I had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e
in order to downgrade to 2.35.1
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 2df6afb20b..a6bbdd67fe 100644 --- 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); |