* [PATCH net-next 1/3] switchdev: fix stp update API to work with layered netdevices
@ 2015-03-06 4:04 roopa
2015-03-06 6:53 ` Jiri Pirko
2015-03-06 9:30 ` Scott Feldman
0 siblings, 2 replies; 4+ messages in thread
From: roopa @ 2015-03-06 4:04 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 | 7 +++++++
net/switchdev/switchdev.c | 30 +++++++++++++++++++++++++++++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index cfcdac2..a93279b 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -51,6 +51,7 @@ int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
struct nlmsghdr *nlh, u16 flags);
int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev,
struct nlmsghdr *nlh, u16 flags);
+int ndo_dflt_netdev_switch_port_stp_update(struct net_device *dev, u8 state);
#else
static inline int netdev_switch_parent_id_get(struct net_device *dev,
@@ -109,6 +110,12 @@ static inline int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *
return 0;
}
+static inline int ndo_dflt_netdev_switch_port_stp_update(struct net_device *dev,
+ u8 state)
+{
+ return 0;
+}
+
#endif
#endif /* _LINUX_SWITCHDEV_H_ */
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 8c1e558..4316eb5 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -48,7 +48,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(netdev_switch_port_stp_update);
@@ -225,3 +225,31 @@ int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
return ret;
}
EXPORT_SYMBOL(ndo_dflt_netdev_switch_port_bridge_dellink);
+
+/**
+ * ndo_dflt_netdev_switch_port_stp_update - default ndo bridge port
+ * stp update function
+ *
+ * @dev: port device
+ * @state: bridge stp state
+ *
+ * Notify master device slaves of bridge port stp state updates
+ */
+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] 4+ messages in thread* Re: [PATCH net-next 1/3] switchdev: fix stp update API to work with layered netdevices
2015-03-06 4:04 [PATCH net-next 1/3] switchdev: fix stp update API to work with layered netdevices roopa
@ 2015-03-06 6:53 ` Jiri Pirko
2015-03-06 9:30 ` Scott Feldman
1 sibling, 0 replies; 4+ messages in thread
From: Jiri Pirko @ 2015-03-06 6:53 UTC (permalink / raw)
To: roopa; +Cc: sfeldma, davem, netdev
Fri, Mar 06, 2015 at 05:04:16AM 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>
Looks good to me. Thanks for taking care of this.
Acked-by: Jiri Pirko <jiri@resnulli.us>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 1/3] switchdev: fix stp update API to work with layered netdevices
2015-03-06 4:04 [PATCH net-next 1/3] switchdev: fix stp update API to work with layered netdevices roopa
2015-03-06 6:53 ` Jiri Pirko
@ 2015-03-06 9:30 ` Scott Feldman
2015-03-07 7:05 ` roopa
1 sibling, 1 reply; 4+ messages in thread
From: Scott Feldman @ 2015-03-06 9:30 UTC (permalink / raw)
To: Roopa Prabhu; +Cc: Jiří Pírko, David S. Miller, Netdev
On Thu, Mar 5, 2015 at 8:04 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>
> ---
> include/net/switchdev.h | 7 +++++++
> net/switchdev/switchdev.c | 30 +++++++++++++++++++++++++++++-
> 2 files changed, 36 insertions(+), 1 deletion(-)
>
> diff --git a/include/net/switchdev.h b/include/net/switchdev.h
> index cfcdac2..a93279b 100644
> --- a/include/net/switchdev.h
> +++ b/include/net/switchdev.h
> @@ -51,6 +51,7 @@ int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
> struct nlmsghdr *nlh, u16 flags);
> int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev,
> struct nlmsghdr *nlh, u16 flags);
> +int ndo_dflt_netdev_switch_port_stp_update(struct net_device *dev, u8 state);
> #else
>
> static inline int netdev_switch_parent_id_get(struct net_device *dev,
> @@ -109,6 +110,12 @@ static inline int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *
> return 0;
> }
>
> +static inline int ndo_dflt_netdev_switch_port_stp_update(struct net_device *dev,
> + u8 state)
> +{
> + return 0;
Shouldn't this be return -EOPNOTSUPP to be consistent with
netdev_switch_port_stp_update() when CONFIG_NET_SWITCHDEV is not
defined?
The rest looks good, thanks Roopa.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next 1/3] switchdev: fix stp update API to work with layered netdevices
2015-03-06 9:30 ` Scott Feldman
@ 2015-03-07 7:05 ` roopa
0 siblings, 0 replies; 4+ messages in thread
From: roopa @ 2015-03-07 7:05 UTC (permalink / raw)
To: Scott Feldman; +Cc: Jiří Pírko, David S. Miller, Netdev
On 3/6/15, 1:30 AM, Scott Feldman wrote:
> On Thu, Mar 5, 2015 at 8:04 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>
>> ---
>> include/net/switchdev.h | 7 +++++++
>> net/switchdev/switchdev.c | 30 +++++++++++++++++++++++++++++-
>> 2 files changed, 36 insertions(+), 1 deletion(-)
>>
>> diff --git a/include/net/switchdev.h b/include/net/switchdev.h
>> index cfcdac2..a93279b 100644
>> --- a/include/net/switchdev.h
>> +++ b/include/net/switchdev.h
>> @@ -51,6 +51,7 @@ int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
>> struct nlmsghdr *nlh, u16 flags);
>> int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev,
>> struct nlmsghdr *nlh, u16 flags);
>> +int ndo_dflt_netdev_switch_port_stp_update(struct net_device *dev, u8 state);
>> #else
>>
>> static inline int netdev_switch_parent_id_get(struct net_device *dev,
>> @@ -109,6 +110,12 @@ static inline int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *
>> return 0;
>> }
>>
>> +static inline int ndo_dflt_netdev_switch_port_stp_update(struct net_device *dev,
>> + u8 state)
>> +{
>> + return 0;
> Shouldn't this be return -EOPNOTSUPP to be consistent with
> netdev_switch_port_stp_update() when CONFIG_NET_SWITCHDEV is not
> defined?
good point. I have made all the dflt op functions return 0 so far. It
does not hurt.
But, to be consistent...yes i will change it to -EOPNOTSUPP.
Thanks scott.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-07 7:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-06 4:04 [PATCH net-next 1/3] switchdev: fix stp update API to work with layered netdevices roopa
2015-03-06 6:53 ` Jiri Pirko
2015-03-06 9:30 ` Scott Feldman
2015-03-07 7:05 ` roopa
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).