net: make dev_get_port_parent_id slightly more readable
authorAntoine Tenart <atenart@kernel.org>
Fri, 8 Oct 2021 14:21:03 +0000 (16:21 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 10 Oct 2021 10:29:14 +0000 (11:29 +0100)
Cosmetic commit making dev_get_port_parent_id slightly more readable.
There is no need to split the condition to return after calling
devlink_compat_switch_id_get and after that 'recurse' is always true.

Signed-off-by: Antoine Tenart <atenart@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 1594cd2..eb61a88 100644 (file)
@@ -9165,14 +9165,11 @@ int dev_get_port_parent_id(struct net_device *dev,
        }
 
        err = devlink_compat_switch_id_get(dev, ppid);
-       if (!err || err != -EOPNOTSUPP)
+       if (!recurse || err != -EOPNOTSUPP)
                return err;
 
-       if (!recurse)
-               return -EOPNOTSUPP;
-
        netdev_for_each_lower_dev(dev, lower_dev, iter) {
-               err = dev_get_port_parent_id(lower_dev, ppid, recurse);
+               err = dev_get_port_parent_id(lower_dev, ppid, true);
                if (err)
                        break;
                if (!first.id_len)