1 files changed, 37 insertions, 24 deletions

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 2a05738570d8..6cb602dd970c 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -296,31 +296,39 @@ static inline u32 dsa_user_ports(struct dsa_switch *ds)
         return mask;
 }
 
-static inline u8 dsa_upstream_port(struct dsa_switch *ds)
+/* Return the local port used to reach an arbitrary switch port */
+static inline unsigned int dsa_towards_port(struct dsa_switch *ds, int device,
+                                            int port)
 {
-        struct dsa_switch_tree *dst = ds->dst;
-
-        /*
-         * If this is the root switch (i.e. the switch that connects
-         * to the CPU), return the cpu port number on this switch.
-         * Else return the (DSA) port number that connects to the
-         * switch that is one hop closer to the cpu.
-         */
-        if (dst->cpu_dp->ds == ds)
-                return dst->cpu_dp->index;
+        if (device == ds->index)
+                return port;
         else
-                return ds->rtable[dst->cpu_dp->ds->index];
+                return ds->rtable[device];
+}
+
+/* Return the local port used to reach the dedicated CPU port */
+static inline unsigned int dsa_upstream_port(struct dsa_switch *ds, int port)
+{
+        const struct dsa_port *dp = dsa_to_port(ds, port);
+        const struct dsa_port *cpu_dp = dp->cpu_dp;
+
+        if (!cpu_dp)
+                return port;
+
+        return dsa_towards_port(ds, cpu_dp->ds->index, cpu_dp->index);
 }
 
 typedef int dsa_fdb_dump_cb_t(const unsigned char *addr, u16 vid,
                               bool is_static, void *data);
 struct dsa_switch_ops {
+#if IS_ENABLED(CONFIG_NET_DSA_LEGACY)
         /*
          * Legacy probing.
          */
         const char      *(*probe)(struct device *dsa_dev,
                                   struct device *host_dev, int sw_addr,
                                   void **priv);
+#endif
 
         enum dsa_tag_protocol (*get_tag_protocol)(struct dsa_switch *ds,
                                                   int port);
@@ -412,12 +420,10 @@ struct dsa_switch_ops {
          */
         int     (*port_vlan_filtering)(struct dsa_switch *ds, int port,
                                        bool vlan_filtering);
-        int     (*port_vlan_prepare)(struct dsa_switch *ds, int port,
-                                     const struct switchdev_obj_port_vlan *vlan,
-                                     struct switchdev_trans *trans);
-        void    (*port_vlan_add)(struct dsa_switch *ds, int port,
-                                 const struct switchdev_obj_port_vlan *vlan,
-                                 struct switchdev_trans *trans);
+        int (*port_vlan_prepare)(struct dsa_switch *ds, int port,
+                                 const struct switchdev_obj_port_vlan *vlan);
+        void (*port_vlan_add)(struct dsa_switch *ds, int port,
+                              const struct switchdev_obj_port_vlan *vlan);
         int     (*port_vlan_del)(struct dsa_switch *ds, int port,
                                  const struct switchdev_obj_port_vlan *vlan);
         /*
@@ -433,12 +439,10 @@ struct dsa_switch_ops {
         /*
          * Multicast database
          */
-        int     (*port_mdb_prepare)(struct dsa_switch *ds, int port,
-                                    const struct switchdev_obj_port_mdb *mdb,
-                                    struct switchdev_trans *trans);
-        void    (*port_mdb_add)(struct dsa_switch *ds, int port,
-                                const struct switchdev_obj_port_mdb *mdb,
-                                struct switchdev_trans *trans);
+        int (*port_mdb_prepare)(struct dsa_switch *ds, int port,
+                                const struct switchdev_obj_port_mdb *mdb);
+        void (*port_mdb_add)(struct dsa_switch *ds, int port,
+                             const struct switchdev_obj_port_mdb *mdb);
         int     (*port_mdb_del)(struct dsa_switch *ds, int port,
                                 const struct switchdev_obj_port_mdb *mdb);
         /*
@@ -472,11 +476,20 @@ struct dsa_switch_driver {
         const struct dsa_switch_ops *ops;
 };
 
+#if IS_ENABLED(CONFIG_NET_DSA_LEGACY)
 /* Legacy driver registration */
 void register_switch_driver(struct dsa_switch_driver *type);
 void unregister_switch_driver(struct dsa_switch_driver *type);
 struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev);
 
+#else
+static inline void register_switch_driver(struct dsa_switch_driver *type) { }
+static inline void unregister_switch_driver(struct dsa_switch_driver *type) { }
+static inline struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev)
+{
+        return NULL;
+}
+#endif
 struct net_device *dsa_dev_to_net_device(struct device *dev);
 
 /* Keep inline for faster access in hot path */