switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion

Caller passing down the SKIP_EOPNOTSUPP switchdev flag expects that
-EOPNOTSUPP cannot be returned. But in case of direct op call without
recurtion, this may happen. So fix this by checking it always on the
end of __switchdev_port_attr_set function.

Fixes: 464314ea6c11 ("switchdev: skip over ports returning -EOPNOTSUPP when recursing ports")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 6dfd19e529387b0399ff5d10196dd6f18181a390..f34e535e93bdf780d7093c84e32a6288029d5442 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -225,8 +225,10 @@ static int __switchdev_port_attr_set(struct net_device *dev,
        struct list_head *iter;
        int err = -EOPNOTSUPP;
 
-       if (ops && ops->switchdev_port_attr_set)
-               return ops->switchdev_port_attr_set(dev, attr, trans);
+       if (ops && ops->switchdev_port_attr_set) {
+               err = ops->switchdev_port_attr_set(dev, attr, trans);
+               goto done;
+       }
 
        if (attr->flags & SWITCHDEV_F_NO_RECURSE)
                goto done;
@@ -238,9 +240,6 @@ static int __switchdev_port_attr_set(struct net_device *dev,
 
        netdev_for_each_lower_dev(dev, lower_dev, iter) {
                err = __switchdev_port_attr_set(lower_dev, attr, trans);
-               if (err == -EOPNOTSUPP &&
-                   attr->flags & SWITCHDEV_F_SKIP_EOPNOTSUPP)
-                       continue;
                if (err)
                        break;
        }