switchdev: convert parent_id_get to switchdev attr get

Switch ID is just a gettable port attribute.  Convert switchdev op
switchdev_parent_id_get to a switchdev attr.

Note: for sysfs and netlink interfaces, SWITCHDEV_ATTR_PORT_PARENT_ID is
called with SWITCHDEV_F_NO_RECUSE to limit switch ID user-visiblity to only
port netdevs.  So when a port is stacked under bond/bridge, the user can
only query switch id via the switch ports, but not via the upper devices

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 7473874..2428299 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4221,14 +4221,21 @@ static const struct net_device_ops rocker_port_netdev_ops = {
  * swdev interface
  ********************/
 
-static int rocker_port_switchdev_parent_id_get(struct net_device *dev,
-                                              struct netdev_phys_item_id *psid)
+static int rocker_port_attr_get(struct net_device *dev,
+                               struct switchdev_attr *attr)
 {
        struct rocker_port *rocker_port = netdev_priv(dev);
        struct rocker *rocker = rocker_port->rocker;
 
-       psid->id_len = sizeof(rocker->hw.id);
-       memcpy(&psid->id, &rocker->hw.id, psid->id_len);
+       switch (attr->id) {
+       case SWITCHDEV_ATTR_PORT_PARENT_ID:
+               attr->ppid.id_len = sizeof(rocker->hw.id);
+               memcpy(&attr->ppid.id, &rocker->hw.id, attr->ppid.id_len);
+               break;
+       default:
+               return -EOPNOTSUPP;
+       }
+
        return 0;
 }
 
@@ -4266,7 +4273,7 @@ static int rocker_port_switchdev_fib_ipv4_del(struct net_device *dev,
 }
 
 static const struct switchdev_ops rocker_port_switchdev_ops = {
-       .switchdev_parent_id_get        = rocker_port_switchdev_parent_id_get,
+       .switchdev_port_attr_get        = rocker_port_attr_get,
        .switchdev_port_stp_update      = rocker_port_switchdev_port_stp_update,
        .switchdev_fib_ipv4_add         = rocker_port_switchdev_fib_ipv4_add,
        .switchdev_fib_ipv4_del         = rocker_port_switchdev_fib_ipv4_del,

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 2820438..93316e7 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -25,12 +25,16 @@ enum switchdev_trans {
 
 enum switchdev_attr_id {
        SWITCHDEV_ATTR_UNDEFINED,
+       SWITCHDEV_ATTR_PORT_PARENT_ID,
 };
 
 struct switchdev_attr {
        enum switchdev_attr_id id;
        enum switchdev_trans trans;
        u32 flags;
+       union {
+               struct netdev_phys_item_id ppid;        /* PORT_PARENT_ID */
+       };
 };
 
 struct fib_info;
@@ -38,10 +42,6 @@ struct fib_info;
 /**
  * struct switchdev_ops - switchdev operations
  *
- * @switchdev_parent_id_get: Called to get an ID of the switch chip this port
- *   is part of.  If driver implements this, it indicates that it
- *   represents a port of a switch chip.
- *
  * @switchdev_port_attr_get: Get a port attribute (see switchdev_attr).
  *
  * @switchdev_port_attr_set: Set a port attribute (see switchdev_attr).
@@ -54,8 +54,6 @@ struct fib_info;
  * @switchdev_fib_ipv4_del: Called to delete IPv4 route from switch device.
  */
 struct switchdev_ops {
-       int     (*switchdev_parent_id_get)(struct net_device *dev,
-                                          struct netdev_phys_item_id *psid);
        int     (*switchdev_port_attr_get)(struct net_device *dev,
                                           struct switchdev_attr *attr);
        int     (*switchdev_port_attr_set)(struct net_device *dev,
@@ -93,8 +91,6 @@ switchdev_notifier_info_to_dev(const struct switchdev_notifier_info *info)
 
 #ifdef CONFIG_NET_SWITCHDEV
 
-int switchdev_parent_id_get(struct net_device *dev,
-                           struct netdev_phys_item_id *psid);
 int switchdev_port_attr_get(struct net_device *dev,
                            struct switchdev_attr *attr);
 int switchdev_port_attr_set(struct net_device *dev,
@@ -120,12 +116,6 @@ void switchdev_fib_ipv4_abort(struct fib_info *fi);
 
 #else
 
-static inline int switchdev_parent_id_get(struct net_device *dev,
-                                         struct netdev_phys_item_id *psid)
-{
-       return -EOPNOTSUPP;
-}
-
 static inline int switchdev_port_attr_get(struct net_device *dev,
                                          struct switchdev_attr *attr)
 {

diff --cc net/core/net-sysfs.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/dsa/slave.c
Simple merge

diff --cc net/switchdev/switchdev.c
Simple merge