1 files changed, 16 insertions, 2 deletions

diff --git a/net/core/devlink.c b/net/core/devlink.c
index d9fbf94ea2a3..b2715a187a11 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -5358,24 +5358,38 @@ static void __devlink_port_type_set(struct devlink_port *devlink_port,
 void devlink_port_type_eth_set(struct devlink_port *devlink_port,
                                struct net_device *netdev)
 {
+        const struct net_device_ops *ops = netdev->netdev_ops;
+
         /* If driver registers devlink port, it should set devlink port
          * attributes accordingly so the compat functions are called
          * and the original ops are not used.
          */
-        if (netdev->netdev_ops->ndo_get_phys_port_name) {
+        if (ops->ndo_get_phys_port_name) {
                 /* Some drivers use the same set of ndos for netdevs
                  * that have devlink_port registered and also for
                  * those who don't. Make sure that ndo_get_phys_port_name
                  * returns -EOPNOTSUPP here in case it is defined.
                  * Warn if not.
                  */
-                const struct net_device_ops *ops = netdev->netdev_ops;
                 char name[IFNAMSIZ];
                 int err;
 
                 err = ops->ndo_get_phys_port_name(netdev, name, sizeof(name));
                 WARN_ON(err != -EOPNOTSUPP);
         }
+        if (ops->ndo_get_port_parent_id) {
+                /* Some drivers use the same set of ndos for netdevs
+                 * that have devlink_port registered and also for
+                 * those who don't. Make sure that ndo_get_port_parent_id
+                 * returns -EOPNOTSUPP here in case it is defined.
+                 * Warn if not.
+                 */
+                struct netdev_phys_item_id ppid;
+                int err;
+
+                err = ops->ndo_get_port_parent_id(netdev, &ppid);
+                WARN_ON(err != -EOPNOTSUPP);
+        }
         __devlink_port_type_set(devlink_port, DEVLINK_PORT_TYPE_ETH, netdev);
 }
 EXPORT_SYMBOL_GPL(devlink_port_type_eth_set);