On 08/12/2020 14:07:55+0200, Vladimir Oltean wrote:
> In anticipation of further simplification, make it more clear what we're
> iterating over.
>
> Signed-off-by: Vladimir Oltean <vladimir.olt...@nxp.com>
Reviewed-by: Alexandre Belloni <alexandre.bell...@bootlin.com>
> ---
> drivers/net/ethernet/mscc/ocelot.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/mscc/ocelot.c
> b/drivers/net/ethernet/mscc/ocelot.c
> index 080fd4ce37ea..c3c6682e6e79 100644
> --- a/drivers/net/ethernet/mscc/ocelot.c
> +++ b/drivers/net/ethernet/mscc/ocelot.c
> @@ -903,7 +903,7 @@ void ocelot_bridge_stp_state_set(struct ocelot *ocelot,
> int port, u8 state)
> {
> struct ocelot_port *ocelot_port = ocelot->ports[port];
> u32 port_cfg;
> - int p, i;
> + int p;
>
> if (!(BIT(port) & ocelot->bridge_mask))
> return;
> @@ -928,14 +928,17 @@ void ocelot_bridge_stp_state_set(struct ocelot *ocelot,
> int port, u8 state)
> ocelot_write_gix(ocelot, port_cfg, ANA_PORT_PORT_CFG, port);
>
> /* Apply FWD mask. The loop is needed to add/remove the current port as
> - * a source for the other ports.
> + * a source for the other ports. If the source port is in a bond, then
> + * all the other ports from that bond need to be removed from this
> + * source port's forwarding mask.
> */
> for (p = 0; p < ocelot->num_phys_ports; p++) {
> if (ocelot->bridge_fwd_mask & BIT(p)) {
> unsigned long mask = ocelot->bridge_fwd_mask & ~BIT(p);
> + int lag;
>
> - for (i = 0; i < ocelot->num_phys_ports; i++) {
> - unsigned long bond_mask = ocelot->lags[i];
> + for (lag = 0; lag < ocelot->num_phys_ports; lag++) {
> + unsigned long bond_mask = ocelot->lags[lag];
>
> if (!bond_mask)
> continue;
> --
> 2.25.1
>
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
