diff options
| author |   Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-10-16 11:12:18 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-10-18 12:24:33 +0100 |
| commit | f8b8b1cd5aadd221742b45eb0ee3c8a80abf036a (patch) | |
| tree | ad5b305182f3406c9de65031dce9577abd743da6 /net/dsa/slave.c | |
| parent | net: dsa: rename dsa_master_get_slave (diff) | |
| download | linux-dev-f8b8b1cd5aadd221742b45eb0ee3c8a80abf036a.tar.xz linux-dev-f8b8b1cd5aadd221742b45eb0ee3c8a80abf036a.zip | |
net: dsa: split dsa_port's netdev member
The dsa_port structure has a "netdev" member, which can be used for
either the master device, or the slave device, depending on its type.
It is true that today, CPU port are not exposed to userspace, thus the
port's netdev member can be used to point to its master interface.
But it is still slightly confusing, so split it into more explicit
"master" and "slave" members inside an anonymous union.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/dsa/slave.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index b72e07503a40..6906de0f0050 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1123,7 +1123,7 @@ static void dsa_slave_notify(struct net_device *dev, unsigned long val) int dsa_slave_create(struct dsa_port *port, const char *name) { struct dsa_port *cpu_dp = port->cpu_dp; - struct net_device *master = cpu_dp->netdev; + struct net_device *master = cpu_dp->master; struct dsa_switch *ds = port->ds; struct net_device *slave_dev; struct dsa_slave_priv *p; @@ -1170,7 +1170,7 @@ int dsa_slave_create(struct dsa_port *port, const char *name) p->old_link = -1; p->old_duplex = -1; - port->netdev = slave_dev; + port->slave = slave_dev; netif_carrier_off(slave_dev); @@ -1198,7 +1198,7 @@ out_phy: out_free: free_percpu(p->stats64); free_netdev(slave_dev); - port->netdev = NULL; + port->slave = NULL; return ret; } |