From: Vladimir Oltean <olteanv@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: netdev <netdev@vger.kernel.org>,
Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Vivien Didelot <vivien.didelot@gmail.com>,
Claudiu Manoil <claudiu.manoil@nxp.com>
Subject: [PATCH RESEND v3 net-next 09/12] net: mscc: ocelot: rename aggr_count to num_ports_in_lag
Date: Sat, 6 Feb 2021 00:02:18 +0200 [thread overview]
Message-ID: <20210205220221.255646-10-olteanv@gmail.com> (raw)
In-Reply-To: <20210205220221.255646-1-olteanv@gmail.com>
From: Vladimir Oltean <vladimir.oltean@nxp.com>
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>
---
Changes in v3:
None.
Changes in v2:
None.
drivers/net/ethernet/mscc/ocelot.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index c906c449d2dd..380a5a661702 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -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);
}
--
2.25.1
next prev parent reply other threads:[~2021-02-06 2:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 22:02 [PATCH RESEND v3 net-next 00/12] LAG offload for Ocelot DSA switches Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 01/12] net: mscc: ocelot: rename ocelot_netdevice_port_event to ocelot_netdevice_changeupper Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 02/12] net: mscc: ocelot: use a switch-case statement in ocelot_netdevice_event Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 03/12] net: mscc: ocelot: don't refuse bonding interfaces we can't offload Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 04/12] net: mscc: ocelot: use ipv6 in the aggregation code Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 05/12] net: mscc: ocelot: set up the bonding mask in a way that avoids a net_device Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 06/12] net: mscc: ocelot: avoid unneeded "lp" variable in LAG join Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 07/12] net: mscc: ocelot: set up logical port IDs centrally Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 08/12] net: mscc: ocelot: drop the use of the "lags" array Vladimir Oltean
2021-02-05 22:02 ` Vladimir Oltean [this message]
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 10/12] net: mscc: ocelot: rebalance LAGs on link up/down events Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 11/12] net: dsa: make assisted_learning_on_cpu_port bypass offloaded LAG interfaces Vladimir Oltean
2021-02-05 22:02 ` [PATCH RESEND v3 net-next 12/12] net: dsa: felix: propagate the LAG offload ops towards the ocelot lib Vladimir Oltean
2021-02-06 23:00 ` [PATCH RESEND v3 net-next 00/12] LAG offload for Ocelot DSA switches patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210205220221.255646-10-olteanv@gmail.com \
--to=olteanv@gmail.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).