net: dsa: dsa_legacy_fdb_{add,del} can be static
Subsystems (3)
Vladimir Oltean
maintainerPATCH 1/1 net: dsa: dsa_legacy_fdb_{add,del} can be static
From: Vladimir Oltean <[email protected]>
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.
--- net/dsa/dsa_priv.h | 9 --------- net/dsa/slave.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 17 deletions(-)
net/dsa/dsa_priv.h +0 -9
@@ -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);
net/dsa/slave.c +8 -8
@@ -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);
Signature · 1 line
2.25.1
Quoted 11 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
Introduced in commit
37b8da1a3c68("net: dsa: Move FDB add/del implementation inside DSA") innet/dsa/legacy.c, these functions were moved again toslave.cas part of commit2a93c1a3651f("net: dsa: Allow compiling out legacy support"), before actually deletingnet/dsa/slave.cin93e86b3bc842("net: dsa: Remove legacy probing support"). Along with that movement there should have been a deletion of the prototypes fromdsa_priv.h, they are not useful.Signed-off-by Vladimir Oltean <[email protected]>
Andrew
Quoted 11 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
Introduced in commit
37b8da1a3c68("net: dsa: Move FDB add/del implementation inside DSA") innet/dsa/legacy.c, these functions were moved again toslave.cas part of commit2a93c1a3651f("net: dsa: Allow compiling out legacy support"), before actually deletingnet/dsa/slave.cin93e86b3bc842("net: dsa: Remove legacy probing support"). Along with that movement there should have been a deletion of the prototypes fromdsa_priv.h, they are not useful.Signed-off-by Vladimir Oltean <[email protected]>
Signature · 1 line
Florian
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 11 lines · On Sat, 9 Jan 2021 01:30:54 +0200 you wrote:
From: Vladimir Oltean <[email protected]>
Introduced in commit
37b8da1a3c68("net: dsa: Move FDB add/del implementation inside DSA") innet/dsa/legacy.c, these functions were moved again toslave.cas part of commit2a93c1a3651f("net: dsa: Allow compiling out legacy support"), before actually deletingnet/dsa/slave.cin93e86b3bc842("net: dsa: Remove legacy probing support"). Along with that movement there should have been a deletion of the prototypes fromdsa_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