Merge tag '4.3-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[linux.git] / include / net / dsa.h

diff --git a/include/net/dsa.h b/include/net/dsa.h
index ba6dfff9819640a53d4f7c1d030d6bbeef601476..1e8650fa8accb7bce28c3eab1f3591f68bddb0e4 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -18,6 +18,7 @@
 #include <linux/net_tstamp.h>
 #include <linux/phy.h>
 #include <linux/platform_data/dsa.h>
+#include <linux/phylink.h>
 #include <net/devlink.h>
 #include <net/switchdev.h>
 
@@ -180,7 +181,7 @@ struct dsa_port {
        struct dsa_switch       *ds;
        unsigned int            index;
        const char              *name;
-       const struct dsa_port   *cpu_dp;
+       struct dsa_port         *cpu_dp;
        const char              *mac;
        struct device_node      *dn;
        unsigned int            ageing_time;
@@ -189,6 +190,7 @@ struct dsa_port {
        struct net_device       *bridge_dev;
        struct devlink_port     devlink_port;
        struct phylink          *pl;
+       struct phylink_config   pl_config;
 
        struct work_struct      xmit_work;
        struct sk_buff_head     xmit_queue;
@@ -355,6 +357,7 @@ struct dsa_switch_ops {
                                                  int port);
 
        int     (*setup)(struct dsa_switch *ds);
+       void    (*teardown)(struct dsa_switch *ds);
        u32     (*get_phy_flags)(struct dsa_switch *ds, int port);
 
        /*