From nobody Tue Dec 3 20:05:01 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2s7y0vVxz5ggL4; Tue, 03 Dec 2024 20:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2s7x5dwLz4lX8; Tue, 3 Dec 2024 20:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733256301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wfnBgBAcnxa7OeCGNk/8b8JjtIeO6L1YZIjA/mSyVX4=; b=A8HMq63aNaHF6J3Hh16sn1jTBPfNiVdOVUDyTo14+1fVT4cY4TFPPIf5mXM3Bfi/+CFSH1 fGnJBQIVbDrplvVS2L3YtQEph5yMhjt1HbBeiY4K99e2uoCmU1kegerDXda+/nk3aac9PB CAGm2zpnNC+ch4wbSOwZg75qCJ5iU2q9yIp9cfR6QPU985qnihL6ki7S5vKyTKda9JLIOy hIp8359exAnQ5hhKwAXX0P4+O0gty53k2uyTtYgQh2EDWgtcuE7cW/lW/nzc7VPNbh03kl QJ3erU+OwWpB/56f97f8KZ08siVWc92VcegucFZ7g8VeNWytrTCEc59L/TC0Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733256301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wfnBgBAcnxa7OeCGNk/8b8JjtIeO6L1YZIjA/mSyVX4=; b=sPI7hxlybJpxrUnb7csFR/QDuBfZyWFA5k2XjaLZGzUhFcebz1BgEXYaDAd0XAWYKXWnWW k5qc9bArZedftQCNKnW/rMEUbJV8e93TNGEXaA8NioI0qZuz6QEE14Tyz68AtcZn1+i4V6 8YQ3bL20pdH9XoUqjV+wYSJEtoRWLXS2J4xz9mwYg0joxcgevGkLMCpY8qLZO3/sp4ToCM 5rypHOfKZf76Yp1h4wQSvR4sepgbdcoWCv1bcBEYWegkM5XBzmyKIgpjD9xxwpx9OgxRk5 7vXgF3JWnqdBDAOsu39L85b6ol2pIAzVS5IDxoyXkPemngNmAjNfj4nyatqPIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733256301; a=rsa-sha256; cv=none; b=B2bq5CRUiEcGYu/KElHj8XwoflY9Pcn+kbds1NfJ2WK73NMHokCAQvmh6YxBjNG5ln57cr uPlNMv9ABAJnayXaaG9Yw1FMz71pkQAsOxcIgElXIgG1OiKYl+68dyqOAalMjXIOBQRScL hlGq0TRuSy2RPazEQF1XhZ+7Kz31YmPoQoVJYa279LFSgG8hKJl7mVnelUjfgrGeT/LbSO CIUfUDZLiztphBb77+FrxtBzZMv4O6skHkWAcCbUfSSYJ9HzrLH4nZeyLyK5tqe2FnP7Ca aF++uQGnhQrYdDQ+QFzV9MxQqNNX05tHPiaZQOoOZMm8tk6Cy0fJFwnfx0bwiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2s7x53yTzcLn; Tue, 3 Dec 2024 20:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B3K51N5061852; Tue, 3 Dec 2024 20:05:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B3K51pM061849; Tue, 3 Dec 2024 20:05:01 GMT (envelope-from git) Date: Tue, 3 Dec 2024 20:05:01 GMT Message-Id: <202412032005.4B3K51pM061849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: fe048349c63c - main - netlink: use proper argument types in genl_register_family() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe048349c63cf183b633936b373222c861d433ea Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fe048349c63cf183b633936b373222c861d433ea commit fe048349c63cf183b633936b373222c861d433ea Author: Gleb Smirnoff AuthorDate: 2024-12-03 20:04:35 +0000 Commit: Gleb Smirnoff 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