When a MRP ring was deleted or disabled, the driver was iterating over
the ports to detect if any other MPR rings exists and in case it didn't
exist it would delete the MAC table entry. But the problem was that it
used the last iterated port to delete the MAC table entry and this could
be a NULL port.
The fix consists of using the port on which the function was called.
Fixes: 7c588c3e96e9733a ("net: ocelot: Extend MRP")
Reported-by: Dan Carpenter <[email protected]>
Signed-off-by: Horatiu Vultur <[email protected]>
---
drivers/net/ethernet/mscc/ocelot_mrp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mscc/ocelot_mrp.c b/drivers/net/ethernet/mscc/ocelot_mrp.c
index 439129a65b71..c3cbcaf64bb2 100644
--- a/drivers/net/ethernet/mscc/ocelot_mrp.c
+++ b/drivers/net/ethernet/mscc/ocelot_mrp.c
@@ -177,7 +177,7 @@ int ocelot_mrp_del(struct ocelot *ocelot, int port,
goto out;
}
- ocelot_mrp_del_mac(ocelot, ocelot_port);
+ ocelot_mrp_del_mac(ocelot, ocelot->ports[port]);
out:
return 0;
}
@@ -251,7 +251,7 @@ int ocelot_mrp_del_ring_role(struct ocelot *ocelot, int port,
goto out;
}
- ocelot_mrp_del_mac(ocelot, ocelot_port);
+ ocelot_mrp_del_mac(ocelot, ocelot->ports[port]);
out:
return 0;
}
--
2.30.1
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Thu, 18 Mar 2021 20:29:38 +0100 you wrote:
> When a MRP ring was deleted or disabled, the driver was iterating over
> the ports to detect if any other MPR rings exists and in case it didn't
> exist it would delete the MAC table entry. But the problem was that it
> used the last iterated port to delete the MAC table entry and this could
> be a NULL port.
>
> The fix consists of using the port on which the function was called.
>
> [...]
Here is the summary with links:
- [net-next] net: ocelot: Fix deletetion of MRP entries from MAC table
https://git.kernel.org/netdev/net-next/c/d25fde64d1c2
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html