net: mscc: ocelot: rename aggr_count to num_ports_in_lag
authorVladimir Oltean <vladimir.oltean@nxp.com>
Fri, 5 Feb 2021 22:02:18 +0000 (00:02 +0200)
committerJakub Kicinski <kuba@kernel.org>
Sat, 6 Feb 2021 22:51:51 +0000 (14:51 -0800)
It makes it a bit easier to read and understand the code that deals with
balancing the 16 aggregation codes among the ports in a certain LAG.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mscc/ocelot.c

index c906c44..380a5a6 100644 (file)
@@ -1298,8 +1298,8 @@ static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
        /* Now, set PGIDs for each active LAG */
        for (lag = 0; lag < ocelot->num_phys_ports; lag++) {
                struct net_device *bond = ocelot->ports[lag]->bond;
+               int num_ports_in_lag = 0;
                unsigned long bond_mask;
-               int aggr_count = 0;
                u8 aggr_idx[16];
 
                if (!bond || (visited & BIT(lag)))
@@ -1311,8 +1311,7 @@ static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
                        // Destination mask
                        ocelot_write_rix(ocelot, bond_mask,
                                         ANA_PGID_PGID, port);
-                       aggr_idx[aggr_count] = port;
-                       aggr_count++;
+                       aggr_idx[num_ports_in_lag++] = port;
                }
 
                for_each_aggr_pgid(ocelot, i) {
@@ -1320,7 +1319,7 @@ static void ocelot_set_aggr_pgids(struct ocelot *ocelot)
 
                        ac = ocelot_read_rix(ocelot, ANA_PGID_PGID, i);
                        ac &= ~bond_mask;
-                       ac |= BIT(aggr_idx[i % aggr_count]);
+                       ac |= BIT(aggr_idx[i % num_ports_in_lag]);
                        ocelot_write_rix(ocelot, ac, ANA_PGID_PGID, i);
                }