a696e325f7
All patches automatically rebased.
Build system: x86_64
Build-tested: ramips/mt7621*
*FS#4149 affects me so I had to revert 7f1edbd412
in order to downgrade to 2.35.1
Signed-off-by: John Audia <graysky@archlinux.us>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 0a7e5a60bdd559d092912adb34bc99c6457d3fb6 Mon Sep 17 00:00:00 2001
|
|
From: Claudiu Manoil <claudiu.manoil@nxp.com>
|
|
Date: Sat, 9 Nov 2019 15:02:58 +0200
|
|
Subject: [PATCH] net: mscc: ocelot: initialize list of multicast addresses in
|
|
common code
|
|
|
|
This is just common path code that belongs to ocelot_init,
|
|
it has nothing to do with a specific SoC/board instance.
|
|
|
|
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
|
|
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mscc/ocelot.c | 1 +
|
|
drivers/net/ethernet/mscc/ocelot_board.c | 1 -
|
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/mscc/ocelot.c
|
|
+++ b/drivers/net/ethernet/mscc/ocelot.c
|
|
@@ -2242,6 +2242,7 @@ int ocelot_init(struct ocelot *ocelot)
|
|
if (!ocelot->stats_queue)
|
|
return -ENOMEM;
|
|
|
|
+ INIT_LIST_HEAD(&ocelot->multicast);
|
|
ocelot_mact_init(ocelot);
|
|
ocelot_vlan_init(ocelot);
|
|
ocelot_ace_init(ocelot);
|
|
--- a/drivers/net/ethernet/mscc/ocelot_board.c
|
|
+++ b/drivers/net/ethernet/mscc/ocelot_board.c
|
|
@@ -372,7 +372,6 @@ static int mscc_ocelot_probe(struct plat
|
|
ocelot->ports = devm_kcalloc(&pdev->dev, ocelot->num_phys_ports,
|
|
sizeof(struct ocelot_port *), GFP_KERNEL);
|
|
|
|
- INIT_LIST_HEAD(&ocelot->multicast);
|
|
ocelot_init(ocelot);
|
|
|
|
for_each_available_child_of_node(ports, portnp) {
|