Skip to content

Commit

Permalink
switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion
Browse files Browse the repository at this point in the history
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: 464314e ("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>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Nov 3, 2015
1 parent 2a4f417 commit 0c63d80
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions net/switchdev/switchdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down

0 comments on commit 0c63d80

Please sign in to comment.