* [PATCH net-next v2 1/3] switchdev: fix stp update API to work with layered netdevices
@ 2015-03-13 0:29 roopa
2015-03-15 16:57 ` Jiri Pirko
2015-03-15 18:17 ` Scott Feldman
0 siblings, 2 replies; 3+ messages in thread
From: roopa @ 2015-03-13 0:29 UTC (permalink / raw)
To: sfeldma, jiri; +Cc: davem, netdev
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 bridge ports
can be bonds and teams which might not implement this ndo.
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
---
include/net/switchdev.h | 1 +
net/switchdev/switchdev.c | 30 +++++++++++++++++++++++++++++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 1a9382f..ccfe2bb 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -57,6 +57,7 @@ int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
u8 tos, u8 type, u32 tb_id);
void netdev_switch_fib_ipv4_abort(struct fib_info *fi);
+int ndo_dflt_netdev_switch_port_stp_update(struct net_device *dev, u8 state);
#else
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index b7a2313..e0e491f 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -50,7 +50,7 @@ int netdev_switch_port_stp_update(struct net_device *dev, u8 state)
if (!ops->ndo_switch_port_stp_update)
return -EOPNOTSUPP;
- WARN_ON(!ops->ndo_switch_parent_id_get);
+
return ops->ndo_switch_port_stp_update(dev, state);
}
EXPORT_SYMBOL_GPL(netdev_switch_port_stp_update);
@@ -393,3 +393,31 @@ void netdev_switch_fib_ipv4_abort(struct fib_info *fi)
fi->fib_net->ipv4.fib_offload_disabled = true;
}
EXPORT_SYMBOL_GPL(netdev_switch_fib_ipv4_abort);
+
+/**
+ * ndo_dflt_netdev_switch_port_stp_update - default ndo bridge port
+ * stp update function
+ *
+ * @dev: port device
+ * @state: bridge stp state
+ *
+ * Propagate stp updates through lowerdevs
+ */
+int ndo_dflt_netdev_switch_port_stp_update(struct net_device *dev, u8 state)
+{
+ struct net_device *lower_dev;
+ struct list_head *iter;
+ int ret = 0, err = 0;
+
+ if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD))
+ return ret;
+
+ 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(ndo_dflt_netdev_switch_port_stp_update);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next v2 1/3] switchdev: fix stp update API to work with layered netdevices
2015-03-13 0:29 [PATCH net-next v2 1/3] switchdev: fix stp update API to work with layered netdevices roopa
@ 2015-03-15 16:57 ` Jiri Pirko
2015-03-15 18:17 ` Scott Feldman
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Pirko @ 2015-03-15 16:57 UTC (permalink / raw)
To: roopa; +Cc: sfeldma, davem, netdev
Fri, Mar 13, 2015 at 01:29:56AM CET, roopa@cumulusnetworks.com wrote:
>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 bridge ports
>can be bonds and teams which might not implement this ndo.
>
>Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v2 1/3] switchdev: fix stp update API to work with layered netdevices
2015-03-13 0:29 [PATCH net-next v2 1/3] switchdev: fix stp update API to work with layered netdevices roopa
2015-03-15 16:57 ` Jiri Pirko
@ 2015-03-15 18:17 ` Scott Feldman
1 sibling, 0 replies; 3+ messages in thread
From: Scott Feldman @ 2015-03-15 18:17 UTC (permalink / raw)
To: Roopa Prabhu; +Cc: Jiří Pírko, David S. Miller, Netdev
On Thu, Mar 12, 2015 at 5:29 PM, <roopa@cumulusnetworks.com> wrote:
> 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 bridge ports
> can be bonds and teams which might not implement this ndo.
>
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
NACK on this. This is a simpler implementation that doesn't touch
team/bonding/vlan drivers and keeps traversal thru stacked devices in
one place; see my other reply to 0/3 cover letter.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-15 18:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-13 0:29 [PATCH net-next v2 1/3] switchdev: fix stp update API to work with layered netdevices roopa
2015-03-15 16:57 ` Jiri Pirko
2015-03-15 18:17 ` Scott Feldman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox