From: roopa@cumulusnetworks.com
To: davem@davemloft.net, sfeldma@gmail.com, jiri@resnulli.us
Cc: netdev@vger.kernel.org
Subject: [PATCH net-next v4] switchdev: fix stp update API to work with layered netdevices
Date: Mon, 16 Mar 2015 10:32:39 -0700 [thread overview]
Message-ID: <1426527159-8039-1-git-send-email-roopa@cumulusnetworks.com> (raw)
From: Roopa Prabhu <roopa@cumulusnetworks.com>
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 imeplement 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
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
---
net/switchdev/switchdev.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index c9bfa00..e593b59 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -47,11 +47,23 @@ EXPORT_SYMBOL_GPL(netdev_switch_parent_id_get);
int netdev_switch_port_stp_update(struct net_device *dev, u8 state)
{
const struct swdev_ops *ops = dev->swdev_ops;
+ struct net_device *lower_dev;
+ struct list_head *iter;
+ int ret = -EOPNOTSUPP, err;
- if (!ops || !ops->swdev_port_stp_update)
- return -EOPNOTSUPP;
- WARN_ON(!ops->swdev_parent_id_get);
- return ops->swdev_port_stp_update(dev, state);
+ if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD))
+ return ret;
+
+ if (ops && ops->swdev_port_stp_update)
+ return ops->swdev_port_stp_update(dev, state);
+
+ netdev_for_each_lower_dev(dev, lower_dev, iter) {
+ err = netdev_switch_port_stp_update(lower_dev, state);
+ if (err && err != -EOPNOTSUPP)
+ ret = err;
+ }
+
+ return ret;
}
EXPORT_SYMBOL_GPL(netdev_switch_port_stp_update);
--
1.7.10.4
next reply other threads:[~2015-03-16 17:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-16 17:32 roopa [this message]
2015-03-16 17:36 ` [PATCH net-next v4] switchdev: fix stp update API to work with layered netdevices Jiri Pirko
2015-03-16 21:26 ` Florian Fainelli
2015-03-17 22:39 ` roopa
2015-03-17 6:10 ` Scott Feldman
2015-03-17 12:42 ` roopa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426527159-8039-1-git-send-email-roopa@cumulusnetworks.com \
--to=roopa@cumulusnetworks.com \
--cc=davem@davemloft.net \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=sfeldma@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).