| Message ID | 20210108233054.1222278-1-olteanv@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4b9c935898dd69b7b73a370325fa95f5bf796bcd |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: dsa: dsa_legacy_fdb_{add,del} can be static | 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-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| 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, 43 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 Sat, Jan 09, 2021 at 01:30:54AM +0200, Vladimir Oltean wrote: > From: Vladimir Oltean <vladimir.oltean@nxp.com> > > Introduced in commit 37b8da1a3c68 ("net: dsa: Move FDB add/del > implementation inside DSA") in net/dsa/legacy.c, these functions were > moved again to slave.c as part of commit 2a93c1a3651f ("net: dsa: Allow > compiling out legacy support"), before actually deleting net/dsa/slave.c > in 93e86b3bc842 ("net: dsa: Remove legacy probing support"). Along with > that movement there should have been a deletion of the prototypes from > dsa_priv.h, they are not useful. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On 1/8/2021 3:30 PM, Vladimir Oltean wrote: > From: Vladimir Oltean <vladimir.oltean@nxp.com> > > Introduced in commit 37b8da1a3c68 ("net: dsa: Move FDB add/del > implementation inside DSA") in net/dsa/legacy.c, these functions were > moved again to slave.c as part of commit 2a93c1a3651f ("net: dsa: Allow > compiling out legacy support"), before actually deleting net/dsa/slave.c > in 93e86b3bc842 ("net: dsa: Remove legacy probing support"). Along with > that movement there should have been a deletion of the prototypes from > dsa_priv.h, they are not useful. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Sat, 9 Jan 2021 01:30:54 +0200 you wrote: > From: Vladimir Oltean <vladimir.oltean@nxp.com> > > Introduced in commit 37b8da1a3c68 ("net: dsa: Move FDB add/del > implementation inside DSA") in net/dsa/legacy.c, these functions were > moved again to slave.c as part of commit 2a93c1a3651f ("net: dsa: Allow > compiling out legacy support"), before actually deleting net/dsa/slave.c > in 93e86b3bc842 ("net: dsa: Remove legacy probing support"). Along with > that movement there should have been a deletion of the prototypes from > dsa_priv.h, they are not useful. > > [...] Here is the summary with links: - [net-next] net: dsa: dsa_legacy_fdb_{add,del} can be static https://git.kernel.org/netdev/net-next/c/4b9c935898dd You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 4f1bbaab72f2..3822520eeeae 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -110,15 +110,6 @@ void dsa_tag_driver_put(const struct dsa_device_ops *ops); bool dsa_schedule_work(struct work_struct *work); const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops); -int dsa_legacy_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], - struct net_device *dev, - const unsigned char *addr, u16 vid, - u16 flags, - struct netlink_ext_ack *extack); -int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], - struct net_device *dev, - const unsigned char *addr, u16 vid); - /* master.c */ int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp); void dsa_master_teardown(struct net_device *dev); diff --git a/net/dsa/slave.c b/net/dsa/slave.c index c8b842ac2600..f8b6a69b6873 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1575,20 +1575,20 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = { }; /* legacy way, bypassing the bridge *****************************************/ -int dsa_legacy_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], - struct net_device *dev, - const unsigned char *addr, u16 vid, - u16 flags, - struct netlink_ext_ack *extack) +static int dsa_legacy_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], + struct net_device *dev, + const unsigned char *addr, u16 vid, + u16 flags, + struct netlink_ext_ack *extack) { struct dsa_port *dp = dsa_slave_to_port(dev); return dsa_port_fdb_add(dp, addr, vid); } -int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], - struct net_device *dev, - const unsigned char *addr, u16 vid) +static int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], + struct net_device *dev, + const unsigned char *addr, u16 vid) { struct dsa_port *dp = dsa_slave_to_port(dev);