switchdev: convert parent_id_get to switchdev attr get

[karo-tx-linux.git] / include / net / switchdev.h

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 282043844bcfb09661244b72a0e7a36652c46532..93316e7ab372f523ae41a06b90fc0f099778d7ee 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)
 {