1 files changed, 8 insertions, 1 deletions

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 6e4a4f9ad927..7a9ab90363be 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -147,7 +147,7 @@ static int __switchdev_port_attr_set(struct net_device *dev,
                 return ops->switchdev_port_attr_set(dev, attr, trans);
 
         if (attr->flags & SWITCHDEV_F_NO_RECURSE)
-                return err;
+                goto done;
 
         /* Switch device port(s) may be stacked under
          * bond/team/vlan dev, so recurse down to set attr on
@@ -156,10 +156,17 @@ 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;
         }
 
+done:
+        if (err == -EOPNOTSUPP && attr->flags & SWITCHDEV_F_SKIP_EOPNOTSUPP)
+                err = 0;
+
         return err;
 }