diff options
| author |   Andrew Lunn <andrew@lunn.ch> | 2015-08-17 23:52:51 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-18 14:17:21 -0700 |
| commit | 60045cbfc0b291dae8dd5b929d67b87c5ea954d4 (patch) | |
| tree | 7053a2ad7bef68e758e0a9923ef632eccddcd61a /drivers/net/dsa | |
| parent | net: dsa: Allow multi hop routes to be expressed (diff) | |
| download | linux-dev-60045cbfc0b291dae8dd5b929d67b87c5ea954d4.tar.xz linux-dev-60045cbfc0b291dae8dd5b929d67b87c5ea954d4.zip | |
net: dsa: Add dsa_is_dsa_port() helper
Add an inline helper for determining is a port is a DSA port.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index 332f2c8090d0..486e9792fc05 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -1926,8 +1926,7 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port) * full duplex. */ reg = _mv88e6xxx_reg_read(ds, REG_PORT(port), PORT_PCS_CTRL); - if (dsa_is_cpu_port(ds, port) || - ds->dsa_port_mask & (1 << port)) { + if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)) { reg |= PORT_PCS_CTRL_FORCE_LINK | PORT_PCS_CTRL_LINK_UP | PORT_PCS_CTRL_DUPLEX_FULL | @@ -1992,7 +1991,7 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port) mv88e6xxx_6165_family(ds) || mv88e6xxx_6097_family(ds) || mv88e6xxx_6095_family(ds) || mv88e6xxx_6065_family(ds) || mv88e6xxx_6320_family(ds)) { - if (ds->dsa_port_mask & (1 << port)) + if (dsa_is_dsa_port(ds, port)) reg |= PORT_CONTROL_FRAME_MODE_DSA; if (port == dsa_upstream_port(ds)) reg |= PORT_CONTROL_FORWARD_UNKNOWN | |