lkml.org 
[lkml]   [2017]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH net-next 3/9] net: dsa: fix dsa_is_normal_port helper
Date
In order to know if a port is of type user, dsa_is_normal_port checks
that the given port is not of type DSA nor CPU. This is not enough
because a port can be unused.

Without the previous fix, this caused the unused mv88e6xxx ports to be
configured in normal mode.

The ds->enabled_port_mask reports the user ports, so check this instead.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
include/net/dsa.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 6b1bc1c8f7e2..4ad432ad2d40 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -273,7 +273,7 @@ static inline bool dsa_is_dsa_port(struct dsa_switch *ds, int p)

static inline bool dsa_is_normal_port(struct dsa_switch *ds, int p)
{
- return !dsa_is_cpu_port(ds, p) && !dsa_is_dsa_port(ds, p);
+ return !!(ds->enabled_port_mask & BIT(p));
}

static inline const struct dsa_port *dsa_to_port(struct dsa_switch *ds, int p)
--
2.14.3
\
 
 \ /
  Last update: 2017-10-26 17:30    [W:0.101 / U:4.000 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site