diff options
author | Roopa Prabhu <roopa@cumulusnetworks.com> | 2015-03-21 13:27:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-23 16:44:56 -0400 |
commit | 558d51fa2f400774ffe3ea76a0df7c1cf92bc598 (patch) | |
tree | 9babb941db8b5e62efa883c79e8dd64f9b8e4dad | |
parent | 08b4b8ea799d27c5dd28e8cb9188d2e88e58d294 (diff) |
switchdev: fix stp update API to work with layered netdevices
make it same as the netdev_switch_port_bridge_setlink/dellink
api (ie traverse lowerdevs to get to the switch port).
removes "WARN_ON(!ops->ndo_switch_parent_id_get)" because
direct bridge ports can be stacked netdevices (like bonds
and team of switch ports) which may not implement this ndo.
v2 to v3:
- remove changes to bond and team. Bring back the
transparently following lowerdevs like i initially
had for setlink/getlink
(http://www.spinics.net/lists/netdev/msg313436.html)
dave and scott feldman also seem to prefer it be that
way and move to non-transparent way of doing things
if we see a problem down the lane.
v3 to v4:
- fix ret initialization
v4 to v5:
- return err on first failure (scott feldman)
v5 to v6:
- change variable name (err) and initialize to
-EOPNOTSUPP (scott feldman).
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/switchdev/switchdev.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index c9bfa004abed..46568b85c333 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c | |||
@@ -47,11 +47,20 @@ EXPORT_SYMBOL_GPL(netdev_switch_parent_id_get); | |||
47 | int netdev_switch_port_stp_update(struct net_device *dev, u8 state) | 47 | int netdev_switch_port_stp_update(struct net_device *dev, u8 state) |
48 | { | 48 | { |
49 | const struct swdev_ops *ops = dev->swdev_ops; | 49 | const struct swdev_ops *ops = dev->swdev_ops; |
50 | struct net_device *lower_dev; | ||
51 | struct list_head *iter; | ||
52 | int err = -EOPNOTSUPP; | ||
50 | 53 | ||
51 | if (!ops || !ops->swdev_port_stp_update) | 54 | if (ops && ops->swdev_port_stp_update) |
52 | return -EOPNOTSUPP; | 55 | return ops->swdev_port_stp_update(dev, state); |
53 | WARN_ON(!ops->swdev_parent_id_get); | 56 | |
54 | return ops->swdev_port_stp_update(dev, state); | 57 | netdev_for_each_lower_dev(dev, lower_dev, iter) { |
58 | err = netdev_switch_port_stp_update(lower_dev, state); | ||
59 | if (err && err != -EOPNOTSUPP) | ||
60 | return err; | ||
61 | } | ||
62 | |||
63 | return err; | ||
55 | } | 64 | } |
56 | EXPORT_SYMBOL_GPL(netdev_switch_port_stp_update); | 65 | EXPORT_SYMBOL_GPL(netdev_switch_port_stp_update); |
57 | 66 | ||