| Message ID | 20210207194733.1811529-1-olteanv@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8043c845b63a2dd88daf2d2d268a33e1872800f0 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: bridge: use switchdev for port flags set through sysfs too | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 3 maintainers not CCed: jiri@mellanox.com ivecera@redhat.com arkadis@mellanox.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 21 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On 07/02/2021 21:47, Vladimir Oltean wrote: > From: Vladimir Oltean <vladimir.oltean@nxp.com> > > Looking through patchwork I don't see that there was any consensus to > use switchdev notifiers only in case of netlink provided port flags but > not sysfs (as a sort of deprecation, punishment or anything like that), > so we should probably keep the user interface consistent in terms of > functionality. > > http://patchwork.ozlabs.org/project/netdev/patch/20170605092043.3523-3-jiri@resnulli.us/ > http://patchwork.ozlabs.org/project/netdev/patch/20170608064428.4785-3-jiri@resnulli.us/ > > Fixes: 3922285d96e7 ("net: bridge: Add support for offloading port attributes") > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> > --- > net/bridge/br_sysfs_if.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c > index 96ff63cde1be..5aea9427ffe1 100644 > --- a/net/bridge/br_sysfs_if.c > +++ b/net/bridge/br_sysfs_if.c > @@ -59,9 +59,8 @@ static BRPORT_ATTR(_name, 0644, \ > static int store_flag(struct net_bridge_port *p, unsigned long v, > unsigned long mask) > { > - unsigned long flags; > - > - flags = p->flags; > + unsigned long flags = p->flags; > + int err; > > if (v) > flags |= mask; > @@ -69,6 +68,10 @@ static int store_flag(struct net_bridge_port *p, unsigned long v, > flags &= ~mask; > > if (flags != p->flags) { > + err = br_switchdev_set_port_flag(p, flags, mask); > + if (err) > + return err; > + > p->flags = flags; > br_port_flags_change(p, mask); > } > Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Sun, 7 Feb 2021 21:47:33 +0200 you wrote: > From: Vladimir Oltean <vladimir.oltean@nxp.com> > > Looking through patchwork I don't see that there was any consensus to > use switchdev notifiers only in case of netlink provided port flags but > not sysfs (as a sort of deprecation, punishment or anything like that), > so we should probably keep the user interface consistent in terms of > functionality. > > [...] Here is the summary with links: - [net] net: bridge: use switchdev for port flags set through sysfs too https://git.kernel.org/netdev/net-next/c/8043c845b63a You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 96ff63cde1be..5aea9427ffe1 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c @@ -59,9 +59,8 @@ static BRPORT_ATTR(_name, 0644, \ static int store_flag(struct net_bridge_port *p, unsigned long v, unsigned long mask) { - unsigned long flags; - - flags = p->flags; + unsigned long flags = p->flags; + int err; if (v) flags |= mask; @@ -69,6 +68,10 @@ static int store_flag(struct net_bridge_port *p, unsigned long v, flags &= ~mask; if (flags != p->flags) { + err = br_switchdev_set_port_flag(p, flags, mask); + if (err) + return err; + p->flags = flags; br_port_flags_change(p, mask); }