diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-10-26 11:22:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-28 00:00:09 +0900 |
| commit | deb8ee0b51204273c120a3b3848efbb5695ad658 (patch) | |
| tree | 3c792ddf9a2cb30b9cb7e98ca2881cc7498c7e93 | |
| parent | 91dee144817e51bbfbdc06af4dc1acce6e92bdda (diff) | |
| download | linux-deb8ee0b51204273c120a3b3848efbb5695ad658.tar.gz linux-deb8ee0b51204273c120a3b3848efbb5695ad658.tar.bz2 linux-deb8ee0b51204273c120a3b3848efbb5695ad658.zip | |
net: dsa: fix dsa_is_normal_port helper
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>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/dsa.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) |