diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-06-13 13:27:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-13 16:35:02 -0400 |
| commit | 6d3c8c0dd88a5ffc7e3695997641e4b6d4c11065 (patch) | |
| tree | 847ec56e33c25db7042393473557a1cebfeb3788 /include/net/dsa.h | |
| parent | 38b6ec5008bb7019a705b576df345509f39d3f4b (diff) | |
| download | op-kernel-dev-6d3c8c0dd88a5ffc7e3695997641e4b6d4c11065.zip op-kernel-dev-6d3c8c0dd88a5ffc7e3695997641e4b6d4c11065.tar.gz | |
net: dsa: Remove master_netdev and use dst->cpu_dp->netdev
In preparation for supporting multiple CPU ports, remove
dst->master_netdev and ds->master_netdev and replace them with only one
instance of the common object we have for a port: struct
dsa_port::netdev. ds->master_netdev is currently write only and would be
helpful in the case where we have two switches, both with CPU ports, and
also connected within each other, which the multi-CPU port patch series
would address.
While at it, introduce a helper function used in net/dsa/slave.c to
immediately get a reference on the master network device called
dsa_master_netdev().
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-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 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 2effb0a..b2fb53f 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -227,11 +227,6 @@ struct dsa_switch { s8 rtable[DSA_MAX_SWITCHES]; /* - * The lower device this switch uses to talk to the host - */ - struct net_device *master_netdev; - - /* * Slave mii_bus and devices for the individual ports. */ u32 dsa_port_mask; |
