Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 464314ea authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

switchdev: skip over ports returning -EOPNOTSUPP when recursing ports 



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: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f55ac58a

include/net/switchdev.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/list.h>

#include <linux/list.h>





#define SWITCHDEV_F_NO_RECURSE		BIT(0)

#define SWITCHDEV_F_NO_RECURSE		BIT(0)

#define SWITCHDEV_F_SKIP_EOPNOTSUPP	BIT(1)





struct switchdev_trans_item {

struct switchdev_trans_item {

	struct list_head list;

	struct list_head list;

net/switchdev/switchdev.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -147,7 +147,7 @@ static int __switchdev_port_attr_set(struct net_device *dev, 
		return ops->switchdev_port_attr_set(dev, attr, trans);

		return ops->switchdev_port_attr_set(dev, attr, trans);





	if (attr->flags & SWITCHDEV_F_NO_RECURSE)

	if (attr->flags & SWITCHDEV_F_NO_RECURSE)

		return err;

		goto done;





	/* Switch device port(s) may be stacked under

	/* Switch device port(s) may be stacked under

	 * bond/team/vlan dev, so recurse down to set attr on

	 * 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) {

	netdev_for_each_lower_dev(dev, lower_dev, iter) {

		err = __switchdev_port_attr_set(lower_dev, attr, trans);

		err = __switchdev_port_attr_set(lower_dev, attr, trans);

		if (err == -EOPNOTSUPP &&

		    attr->flags & SWITCHDEV_F_SKIP_EOPNOTSUPP)

			continue;

		if (err)

		if (err)

			break;

			break;

	}

	}





done:

	if (err == -EOPNOTSUPP && attr->flags & SWITCHDEV_F_SKIP_EOPNOTSUPP)

		err = 0;



	return err;

	return err;

}

}