diff options
author | Scott Feldman <sfeldma@gmail.com> | 2015-10-08 22:23:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-12 08:20:20 -0400 |
commit | 464314ea6c119ebc22ee78453e63814453c31611 (patch) | |
tree | 1b9a19c0d09caebaaf372e194ab36be84f10a84d /net/switchdev/switchdev.c | |
parent | f55ac58ae64cbb0315382e738681fe31837dcac0 (diff) |
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: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev/switchdev.c')
-rw-r--r-- | net/switchdev/switchdev.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 6e4a4f9ad927..7a9ab90363be 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, | |||
147 | return ops->switchdev_port_attr_set(dev, attr, trans); | 147 | return ops->switchdev_port_attr_set(dev, attr, trans); |
148 | 148 | ||
149 | if (attr->flags & SWITCHDEV_F_NO_RECURSE) | 149 | if (attr->flags & SWITCHDEV_F_NO_RECURSE) |
150 | return err; | 150 | goto done; |
151 | 151 | ||
152 | /* Switch device port(s) may be stacked under | 152 | /* Switch device port(s) may be stacked under |
153 | * bond/team/vlan dev, so recurse down to set attr on | 153 | * 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, | |||
156 | 156 | ||
157 | netdev_for_each_lower_dev(dev, lower_dev, iter) { | 157 | netdev_for_each_lower_dev(dev, lower_dev, iter) { |
158 | err = __switchdev_port_attr_set(lower_dev, attr, trans); | 158 | err = __switchdev_port_attr_set(lower_dev, attr, trans); |
159 | if (err == -EOPNOTSUPP && | ||
160 | attr->flags & SWITCHDEV_F_SKIP_EOPNOTSUPP) | ||
161 | continue; | ||
159 | if (err) | 162 | if (err) |
160 | break; | 163 | break; |
161 | } | 164 | } |
162 | 165 | ||
166 | done: | ||
167 | if (err == -EOPNOTSUPP && attr->flags & SWITCHDEV_F_SKIP_EOPNOTSUPP) | ||
168 | err = 0; | ||
169 | |||
163 | return err; | 170 | return err; |
164 | } | 171 | } |
165 | 172 | ||