diff options
author | Vivien Didelot | 2017-10-26 17:22:55 +0200 |
---|---|---|
committer | David S. Miller | 2017-10-27 17:00:09 +0200 |
commit | 4a5b85ffe2a001b52d165931ad05d2d620daca3c (patch) | |
tree | e36bcf74ffadedffa5dfc613bfd946e3245733c5 /drivers/net/dsa/mt7530.c | |
parent | net: dsa: rename dsa_is_normal_port helper (diff) | |
download | kernel-qcow2-linux-4a5b85ffe2a001b52d165931ad05d2d620daca3c.tar.gz kernel-qcow2-linux-4a5b85ffe2a001b52d165931ad05d2d620daca3c.tar.xz kernel-qcow2-linux-4a5b85ffe2a001b52d165931ad05d2d620daca3c.zip |
net: dsa: use dsa_is_user_port everywhere
Most of the DSA code still check ds->enabled_port_mask directly to
inspect a given port type instead of using the provided dsa_is_user_port
helper. Change this.
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>
Diffstat (limited to 'drivers/net/dsa/mt7530.c')
-rw-r--r-- | drivers/net/dsa/mt7530.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 21431be2831e..d1d4eea6a875 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -781,7 +781,7 @@ mt7530_port_bridge_join(struct dsa_switch *ds, int port, * same bridge. If the port is disabled, port matrix is kept * and not being setup until the port becomes enabled. */ - if (ds->enabled_port_mask & BIT(i) && i != port) { + if (dsa_is_user_port(ds, i) && i != port) { if (dsa_to_port(ds, i)->bridge_dev != bridge) continue; if (priv->ports[i].enable) @@ -818,7 +818,7 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, * in the same bridge. If the port is disabled, port matrix * is kept and not being setup until the port becomes enabled. */ - if (ds->enabled_port_mask & BIT(i) && i != port) { + if (dsa_is_user_port(ds, i) && i != port) { if (dsa_to_port(ds, i)->bridge_dev != bridge) continue; if (priv->ports[i].enable) |