Re: [PATCH net-next 04/16] net: dsa: use ports list to find slave

[Andrew Lunn]

On Sat, Oct 19, 2019 at 11:19:29PM -0400, Vivien Didelot wrote:
> 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 

Reviewed-by: Andrew Lunn 

Andrew

Re: [PATCH net-next 04/16] net: dsa: use ports list to find slave

[Florian Fainelli]

On 10/19/2019 8:19 PM, Vivien Didelot wrote:
> 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 

Reviewed-by: Florian Fainelli 
-- 
Florian

[PATCH net-next 04/16] net: dsa: use ports list to find slave

[Vivien Didelot]

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 
---
 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, >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 = >ports[port];
-
-   if (unlikely(slave_port->type != DSA_PORT_TYPE_USER))
-   return NULL;
-
-   return slave_port->slave;
+   return NULL;
 }
 
 /* port.c */
-- 
2.23.0