net: dsa: Implement ndo_get_port_parent_id()

DSA implements SWITCHDEV_ATTR_ID_PORT_PARENT_ID and we want to get rid
of switchdev_ops eventually, ease that migration by implementing a
ndo_get_port_parent_id() function which returns what
switchdev_port_attr_get() would do.

Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 91de3a6632268153022500a72f1b774c2796dbde..70395a0ae52e9c91266971809889210b342c94aa 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -362,18 +362,23 @@ static int dsa_slave_port_obj_del(struct net_device *dev,
        return err;
 }
 
-static int dsa_slave_port_attr_get(struct net_device *dev,
-                                  struct switchdev_attr *attr)
+static int dsa_slave_get_port_parent_id(struct net_device *dev,
+                                       struct netdev_phys_item_id *ppid)
 {
        struct dsa_port *dp = dsa_slave_to_port(dev);
        struct dsa_switch *ds = dp->ds;
        struct dsa_switch_tree *dst = ds->dst;
 
+       ppid->id_len = sizeof(dst->index);
+       memcpy(&ppid->id, &dst->index, ppid->id_len);
+
+       return 0;
+}
+
+static int dsa_slave_port_attr_get(struct net_device *dev,
+                                  struct switchdev_attr *attr)
+{
        switch (attr->id) {
-       case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:
-               attr->u.ppid.id_len = sizeof(dst->index);
-               memcpy(&attr->u.ppid.id, &dst->index, attr->u.ppid.id_len);
-               break;
        case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:
                attr->u.brport_flags_support = 0;
                break;
@@ -1046,6 +1051,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
        .ndo_get_phys_port_name = dsa_slave_get_phys_port_name,
        .ndo_setup_tc           = dsa_slave_setup_tc,
        .ndo_get_stats64        = dsa_slave_get_stats64,
+       .ndo_get_port_parent_id = dsa_slave_get_port_parent_id,
 };
 
 static const struct switchdev_ops dsa_slave_switchdev_ops = {