From: Vivien Didelot <vivien.didelot@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
netdev@vger.kernel.org
Subject: [PATCH net-next 04/16] net: dsa: use ports list to find slave
Date: Sat, 19 Oct 2019 23:19:29 -0400 [thread overview]
Message-ID: <20191020031941.3805884-5-vivien.didelot@gmail.com> (raw)
In-Reply-To: <20191020031941.3805884-1-vivien.didelot@gmail.com>
Use the new ports list instead of iterating over switches and their
ports when looking for a slave device from a given master interface.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
---
net/dsa/dsa_priv.h | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 12f8c7ee4dd8..53e7577896b6 100644
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -104,25 +104,14 @@ static inline struct net_device *dsa_master_find_slave(struct net_device *dev,
{
struct dsa_port *cpu_dp = dev->dsa_ptr;
struct dsa_switch_tree *dst = cpu_dp->dst;
- struct dsa_switch *ds;
- struct dsa_port *slave_port;
+ struct dsa_port *dp;
- if (device < 0 || device >= DSA_MAX_SWITCHES)
- return NULL;
+ list_for_each_entry(dp, &dst->ports, list)
+ if (dp->ds->index == device && dp->index == port &&
+ dp->type == DSA_PORT_TYPE_USER)
+ return dp->slave;
- ds = dst->ds[device];
- if (!ds)
- return NULL;
-
- if (port < 0 || port >= ds->num_ports)
- return NULL;
-
- slave_port = &ds->ports[port];
-
- if (unlikely(slave_port->type != DSA_PORT_TYPE_USER))
- return NULL;
-
- return slave_port->slave;
+ return NULL;
}
/* port.c */
--
2.23.0
next prev parent reply other threads:[~2019-10-20 3:21 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-20 3:19 [PATCH net-next 00/16] net: dsa: turn arrays of ports into a list Vivien Didelot
2019-10-20 3:19 ` [PATCH net-next 01/16] net: dsa: use dsa_to_port helper everywhere Vivien Didelot
2019-10-21 2:34 ` Florian Fainelli
2019-10-21 12:31 ` Andrew Lunn
2019-10-21 15:44 ` Vivien Didelot
2019-10-20 3:19 ` [PATCH net-next 02/16] net: dsa: add ports list in the switch fabric Vivien Didelot
2019-10-21 2:36 ` Florian Fainelli
2019-10-21 2:58 ` Florian Fainelli
2019-10-21 12:37 ` Andrew Lunn
2019-10-21 20:00 ` Vivien Didelot
2019-10-20 3:19 ` [PATCH net-next 03/16] net: dsa: use ports list in dsa_to_port Vivien Didelot
2019-10-21 2:38 ` Florian Fainelli
2019-10-21 12:39 ` Andrew Lunn
2019-10-20 3:19 ` Vivien Didelot [this message]
2019-10-21 2:39 ` [PATCH net-next 04/16] net: dsa: use ports list to find slave Florian Fainelli
2019-10-21 12:42 ` Andrew Lunn
2019-10-20 3:19 ` [PATCH net-next 05/16] net: dsa: use ports list to setup switches Vivien Didelot
2019-10-21 2:42 ` Florian Fainelli
2019-10-21 12:49 ` Andrew Lunn
2019-10-21 19:37 ` Vivien Didelot
2019-10-20 3:19 ` [PATCH net-next 06/16] net: dsa: use ports list for routing table setup Vivien Didelot
2019-10-21 2:42 ` Florian Fainelli
2019-10-21 12:50 ` Andrew Lunn
2019-10-20 3:19 ` [PATCH net-next 07/16] net: dsa: use ports list to find a port by node Vivien Didelot
2019-10-21 2:43 ` Florian Fainelli
2019-10-20 3:19 ` [PATCH net-next 08/16] net: dsa: use ports list to setup multiple master devices Vivien Didelot
2019-10-21 3:03 ` Florian Fainelli
2019-10-21 14:17 ` Andrew Lunn
2019-10-20 3:19 ` [PATCH net-next 09/16] net: dsa: use ports list to find first CPU port Vivien Didelot
2019-10-21 2:46 ` Florian Fainelli
2019-10-20 3:19 ` [PATCH net-next 10/16] net: dsa: use ports list to setup default " Vivien Didelot
2019-10-21 2:47 ` Florian Fainelli
2019-10-20 3:19 ` [PATCH net-next 11/16] net: dsa: mv88e6xxx: silently skip PVT ops Vivien Didelot
2019-10-21 2:48 ` Florian Fainelli
2019-10-20 3:19 ` [PATCH net-next 12/16] net: dsa: mv88e6xxx: use ports list to map port VLAN Vivien Didelot
2019-10-21 2:50 ` Florian Fainelli
2019-10-20 3:19 ` [PATCH net-next 13/16] net: dsa: mv88e6xxx: use ports list to map bridge Vivien Didelot
2019-10-21 2:52 ` Florian Fainelli
2019-10-20 3:19 ` [PATCH net-next 14/16] net: dsa: sja1105: register switch before assigning port private data Vivien Didelot
2019-10-20 3:19 ` [PATCH net-next 15/16] net: dsa: allocate ports on touch Vivien Didelot
2019-10-21 2:56 ` Florian Fainelli
2019-10-20 3:19 ` [PATCH net-next 16/16] net: dsa: remove dsa_switch_alloc helper Vivien Didelot
2019-10-21 2:55 ` Florian Fainelli
2019-10-21 18:32 ` [PATCH net-next 00/16] net: dsa: turn arrays of ports into a list David Miller
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=20191020031941.3805884-5-vivien.didelot@gmail.com \
--to=vivien.didelot@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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
all inboxes | Powered by JetHome®