redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: 464314ea6c ("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>
hifive-unleashed-5.1
Jiri Pirko 2015-11-03 17:40:53 +01:00 committed by David S. Miller
parent 2a4f417621
commit 0c63d80c3f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/switchdev/switchdev.c
View File

@ -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;
}