diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2016-04-13 02:40:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-13 18:15:23 -0400 |
| commit | 74c3e2a54b7d9eb57f23fb0e157b90bb6dae629f (patch) | |
| tree | 31a0d1f055d42843bfbc47ba25d0c707a9e7d8ed /include/net/dsa.h | |
| parent | e49bad319630dedeeda3a638a707ec7b5d402ad5 (diff) | |
| download | linux-74c3e2a54b7d9eb57f23fb0e157b90bb6dae629f.tar.gz linux-74c3e2a54b7d9eb57f23fb0e157b90bb6dae629f.tar.xz | |
dsa: Rename phys_port_mask to enabled_port_mask
The phys in phys_port_mask suggests this mask is about PHYs. In fact,
it means physical ports. Rename to enabled_port_mask, indicating
external enabled ports of the switch, which is hopefully less
confusing.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/dsa.h')
| -rw-r--r-- | include/net/dsa.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 165c2e10615c..689ebd3542ba 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -167,7 +167,7 @@ struct dsa_switch { * Slave mii_bus and devices for the individual ports. */ u32 dsa_port_mask; - u32 phys_port_mask; + u32 enabled_port_mask; u32 phys_mii_mask; struct mii_bus *slave_mii_bus; struct net_device *ports[DSA_MAX_PORTS]; @@ -185,7 +185,7 @@ static inline bool dsa_is_dsa_port(struct dsa_switch *ds, int p) static inline bool dsa_is_port_initialized(struct dsa_switch *ds, int p) { - return ds->phys_port_mask & (1 << p) && ds->ports[p]; + return ds->enabled_port_mask & (1 << p) && ds->ports[p]; } static inline u8 dsa_upstream_port(struct dsa_switch *ds) |