diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2015-11-03 17:40:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-03 19:39:21 +0100 |
| commit | 0c63d80c3fac4e6eb0f01dff756e47bc7cd50092 (patch) | |
| tree | d9fc65ba40a8d6e3c444a29dab3ef37ad6c99c4a /net/switchdev/switchdev.c | |
| parent | net: sched: kill dead code in sch_choke.c (diff) | |
| download | linux-0c63d80c3fac4e6eb0f01dff756e47bc7cd50092.tar.xz linux-0c63d80c3fac4e6eb0f01dff756e47bc7cd50092.zip | |
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: 464314ea6c11 ("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>
Diffstat (limited to '')
| -rw-r--r-- | net/switchdev/switchdev.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 6dfd19e52938..f34e535e93bd 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -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; } |