mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-11-27 01:11:31 +00:00
rtnetlink: Use rtnl_register_many().
We will remove rtnl_register() in favour of rtnl_register_many(). When it succeeds, rtnl_register_many() guarantees all rtnetlink types in the passed array are supported, and there is no chance that a part of message types is not supported. Let's use rtnl_register_many() instead. Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Link: https://patch.msgid.link/20241014201828.91221-3-kuniyu@amazon.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
09aec57d83
commit
181bc7875b
1 changed files with 33 additions and 30 deletions
|
|
@ -6843,6 +6843,38 @@ static struct pernet_operations rtnetlink_net_ops = {
|
|||
.exit = rtnetlink_net_exit,
|
||||
};
|
||||
|
||||
static const struct rtnl_msg_handler rtnetlink_rtnl_msg_handlers[] __initconst = {
|
||||
{.msgtype = RTM_NEWLINK, .doit = rtnl_newlink},
|
||||
{.msgtype = RTM_DELLINK, .doit = rtnl_dellink},
|
||||
{.msgtype = RTM_GETLINK, .doit = rtnl_getlink,
|
||||
.dumpit = rtnl_dump_ifinfo, .flags = RTNL_FLAG_DUMP_SPLIT_NLM_DONE},
|
||||
{.msgtype = RTM_SETLINK, .doit = rtnl_setlink},
|
||||
{.msgtype = RTM_GETADDR, .dumpit = rtnl_dump_all},
|
||||
{.msgtype = RTM_GETROUTE, .dumpit = rtnl_dump_all},
|
||||
{.msgtype = RTM_GETNETCONF, .dumpit = rtnl_dump_all},
|
||||
{.msgtype = RTM_GETSTATS, .doit = rtnl_stats_get,
|
||||
.dumpit = rtnl_stats_dump},
|
||||
{.msgtype = RTM_SETSTATS, .doit = rtnl_stats_set},
|
||||
{.msgtype = RTM_NEWLINKPROP, .doit = rtnl_newlinkprop},
|
||||
{.msgtype = RTM_DELLINKPROP, .doit = rtnl_dellinkprop},
|
||||
{.protocol = PF_BRIDGE, .msgtype = RTM_GETLINK,
|
||||
.dumpit = rtnl_bridge_getlink},
|
||||
{.protocol = PF_BRIDGE, .msgtype = RTM_DELLINK,
|
||||
.doit = rtnl_bridge_dellink},
|
||||
{.protocol = PF_BRIDGE, .msgtype = RTM_SETLINK,
|
||||
.doit = rtnl_bridge_setlink},
|
||||
{.protocol = PF_BRIDGE, .msgtype = RTM_NEWNEIGH, .doit = rtnl_fdb_add},
|
||||
{.protocol = PF_BRIDGE, .msgtype = RTM_DELNEIGH, .doit = rtnl_fdb_del,
|
||||
.flags = RTNL_FLAG_BULK_DEL_SUPPORTED},
|
||||
{.protocol = PF_BRIDGE, .msgtype = RTM_GETNEIGH, .doit = rtnl_fdb_get,
|
||||
.dumpit = rtnl_fdb_dump},
|
||||
{.protocol = PF_BRIDGE, .msgtype = RTM_NEWMDB, .doit = rtnl_mdb_add},
|
||||
{.protocol = PF_BRIDGE, .msgtype = RTM_DELMDB, .doit = rtnl_mdb_del,
|
||||
.flags = RTNL_FLAG_BULK_DEL_SUPPORTED},
|
||||
{.protocol = PF_BRIDGE, .msgtype = RTM_GETMDB, .doit = rtnl_mdb_get,
|
||||
.dumpit = rtnl_mdb_dump},
|
||||
};
|
||||
|
||||
void __init rtnetlink_init(void)
|
||||
{
|
||||
if (register_pernet_subsys(&rtnetlink_net_ops))
|
||||
|
|
@ -6850,34 +6882,5 @@ void __init rtnetlink_init(void)
|
|||
|
||||
register_netdevice_notifier(&rtnetlink_dev_notifier);
|
||||
|
||||
rtnl_register(PF_UNSPEC, RTM_GETLINK, rtnl_getlink,
|
||||
rtnl_dump_ifinfo, RTNL_FLAG_DUMP_SPLIT_NLM_DONE);
|
||||
rtnl_register(PF_UNSPEC, RTM_SETLINK, rtnl_setlink, NULL, 0);
|
||||
rtnl_register(PF_UNSPEC, RTM_NEWLINK, rtnl_newlink, NULL, 0);
|
||||
rtnl_register(PF_UNSPEC, RTM_DELLINK, rtnl_dellink, NULL, 0);
|
||||
|
||||
rtnl_register(PF_UNSPEC, RTM_GETADDR, NULL, rtnl_dump_all, 0);
|
||||
rtnl_register(PF_UNSPEC, RTM_GETROUTE, NULL, rtnl_dump_all, 0);
|
||||
rtnl_register(PF_UNSPEC, RTM_GETNETCONF, NULL, rtnl_dump_all, 0);
|
||||
|
||||
rtnl_register(PF_UNSPEC, RTM_NEWLINKPROP, rtnl_newlinkprop, NULL, 0);
|
||||
rtnl_register(PF_UNSPEC, RTM_DELLINKPROP, rtnl_dellinkprop, NULL, 0);
|
||||
|
||||
rtnl_register(PF_BRIDGE, RTM_NEWNEIGH, rtnl_fdb_add, NULL, 0);
|
||||
rtnl_register(PF_BRIDGE, RTM_DELNEIGH, rtnl_fdb_del, NULL,
|
||||
RTNL_FLAG_BULK_DEL_SUPPORTED);
|
||||
rtnl_register(PF_BRIDGE, RTM_GETNEIGH, rtnl_fdb_get, rtnl_fdb_dump, 0);
|
||||
|
||||
rtnl_register(PF_BRIDGE, RTM_GETLINK, NULL, rtnl_bridge_getlink, 0);
|
||||
rtnl_register(PF_BRIDGE, RTM_DELLINK, rtnl_bridge_dellink, NULL, 0);
|
||||
rtnl_register(PF_BRIDGE, RTM_SETLINK, rtnl_bridge_setlink, NULL, 0);
|
||||
|
||||
rtnl_register(PF_UNSPEC, RTM_GETSTATS, rtnl_stats_get, rtnl_stats_dump,
|
||||
0);
|
||||
rtnl_register(PF_UNSPEC, RTM_SETSTATS, rtnl_stats_set, NULL, 0);
|
||||
|
||||
rtnl_register(PF_BRIDGE, RTM_GETMDB, rtnl_mdb_get, rtnl_mdb_dump, 0);
|
||||
rtnl_register(PF_BRIDGE, RTM_NEWMDB, rtnl_mdb_add, NULL, 0);
|
||||
rtnl_register(PF_BRIDGE, RTM_DELMDB, rtnl_mdb_del, NULL,
|
||||
RTNL_FLAG_BULK_DEL_SUPPORTED);
|
||||
rtnl_register_many(rtnetlink_rtnl_msg_handlers);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue