Commit d0d14aef authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

neighbour: 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: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20241014201828.91221-4-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 181bc787

net/core/neighbour.c

+10 −9
Original line number Diff line number Diff line
@@ -3886,17 +3886,18 @@ EXPORT_SYMBOL(neigh_sysctl_unregister); 


#endif	/* CONFIG_SYSCTL */



static const struct rtnl_msg_handler neigh_rtnl_msg_handlers[] __initconst = {

	{.msgtype = RTM_NEWNEIGH, .doit = neigh_add},

	{.msgtype = RTM_DELNEIGH, .doit = neigh_delete},

	{.msgtype = RTM_GETNEIGH, .doit = neigh_get, .dumpit = neigh_dump_info,

	 .flags = RTNL_FLAG_DUMP_UNLOCKED},

	{.msgtype = RTM_GETNEIGHTBL, .dumpit = neightbl_dump_info},

	{.msgtype = RTM_SETNEIGHTBL, .doit = neightbl_set},

};



static int __init neigh_init(void)

{

	rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL, 0);

	rtnl_register(PF_UNSPEC, RTM_GETNEIGH, neigh_get, neigh_dump_info,

		      RTNL_FLAG_DUMP_UNLOCKED);



	rtnl_register(PF_UNSPEC, RTM_GETNEIGHTBL, NULL, neightbl_dump_info,

		      0);

	rtnl_register(PF_UNSPEC, RTM_SETNEIGHTBL, neightbl_set, NULL, 0);



	rtnl_register_many(neigh_rtnl_msg_handlers);

	return 0;

}