From: Scott Feldman <sfel...@gmail.com>

This allows us to recurse over all the ports, skipping over unsupporting
ports.  Without the change, the recursion would stop at first unsupported
port.

Signed-off-by: Scott Feldman <sfel...@gmail.com>
---
 include/net/switchdev.h   |    1 +
 net/switchdev/switchdev.c |    9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 61f129b..1ce7083 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -16,6 +16,7 @@
 #include <linux/list.h>
 
 #define SWITCHDEV_F_NO_RECURSE         BIT(0)
+#define SWITCHDEV_F_SKIP_EOPNOTSUPP    BIT(1)
 
 struct switchdev_trans_item {
        struct list_head list;
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 6e4a4f9..7a9ab90 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;
 }
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to