The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fe048349c63cf183b633936b373222c861d433ea
commit fe048349c63cf183b633936b373222c861d433ea Author: Gleb Smirnoff <[email protected]> AuthorDate: 2024-12-03 20:04:35 +0000 Commit: Gleb Smirnoff <[email protected]> CommitDate: 2024-12-03 20:04:35 +0000 netlink: use proper argument types in genl_register_family() Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D47553 --- sys/netlink/netlink_ctl.h | 2 +- sys/netlink/netlink_generic_kpi.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/netlink/netlink_ctl.h b/sys/netlink/netlink_ctl.h index 2d4737b61c40..c2ac3e99421e 100644 --- a/sys/netlink/netlink_ctl.h +++ b/sys/netlink/netlink_ctl.h @@ -95,7 +95,7 @@ struct genl_cmd { }; uint32_t genl_register_family(const char *family_name, size_t hdrsize, - int family_version, int max_attr_idx); + uint16_t family_version, uint16_t max_attr_idx); bool genl_unregister_family(const char *family_name); bool genl_register_cmds(const char *family_name, const struct genl_cmd *cmds, int count); diff --git a/sys/netlink/netlink_generic_kpi.c b/sys/netlink/netlink_generic_kpi.c index 4e40bb7dfc49..e6125ab893d8 100644 --- a/sys/netlink/netlink_generic_kpi.c +++ b/sys/netlink/netlink_generic_kpi.c @@ -93,10 +93,9 @@ find_empty_family_id(const char *family_name) } uint32_t -genl_register_family(const char *family_name, size_t hdrsize, int family_version, - int max_attr_idx) +genl_register_family(const char *family_name, size_t hdrsize, + uint16_t family_version, uint16_t max_attr_idx) { - uint32_t family_id = 0; MPASS(family_name != NULL); if (find_family(family_name) != NULL) @@ -111,13 +110,13 @@ genl_register_family(const char *family_name, size_t hdrsize, int family_version gf->family_version = family_version; gf->family_hdrsize = hdrsize; gf->family_attr_max = max_attr_idx; - NL_LOG(LOG_DEBUG2, "Registered family %s id %d", gf->family_name, gf->family_id); - family_id = gf->family_id; + NL_LOG(LOG_DEBUG2, "Registered family %s id %d", gf->family_name, + gf->family_id); EVENTHANDLER_INVOKE(genl_family_event, gf, CTRL_CMD_NEWFAMILY); GENL_UNLOCK(); - return (family_id); + return (gf->family_id); } static void
