From c0288ae8e6bd402785360de5bbc94ded770af000 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Fri, 8 Oct 2021 16:21:03 +0200 Subject: [PATCH] net: make dev_get_port_parent_id slightly more readable 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 Signed-off-by: David S. Miller --- net/core/dev.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 1594cd2..eb61a88 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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) -- 2.7.4