diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-09 01:26:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-09 01:26:50 +0100 |
| commit | 19aeeb9f46cb4b9474ebeb50cb01b9a1adba73b8 (patch) | |
| tree | 4595fb0d4562f8344212e3f0c2842d5ab8a63cfb /net/dsa/dsa_priv.h | |
| parent | openvswitch: enable NSH support (diff) | |
| parent | net: dsa: rename probe and remove switch functions (diff) | |
| download | linux-19aeeb9f46cb4b9474ebeb50cb01b9a1adba73b8.tar.xz linux-19aeeb9f46cb4b9474ebeb50cb01b9a1adba73b8.zip | |
Merge branch 'dsa-setup-stage'
Vivien Didelot says:
====================
net: dsa: setup stage
When probing a DSA switch, there is basically two stages.
The first stage is the parsing of the switch device, from either device
tree or platform data. It fetches the DSA tree to which it belongs, and
validates its ports. The switch device is then added to the tree, and
the second stage is called if this was the last switch of the tree.
The second stage is the setup of the tree, which validates that the tree
is complete, sets up the routing tables, the default CPU port for user
ports, sets up the switch drivers and finally the master interfaces,
which makes the whole switch fabric functional.
This patch series covers the second setup stage. The setup and teardown
of a switch tree have been separated into logical steps, and the probing
of a switch now simply parses and adds a switch to a tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/dsa_priv.h')
| -rw-r--r-- | net/dsa/dsa_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 253a613c40cd..bb0218c1b570 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -108,8 +108,8 @@ int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], const unsigned char *addr, u16 vid); /* master.c */ -int dsa_master_ethtool_setup(struct net_device *dev); -void dsa_master_ethtool_restore(struct net_device *dev); +int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp); +void dsa_master_teardown(struct net_device *dev); static inline struct net_device *dsa_master_find_slave(struct net_device *dev, int device, int port) |