From nobody Mon Jan 20 21:40:11 2025 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 4YcNzb3RSvz5l0Gy; Mon, 20 Jan 2025 21:40:11 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YcNzb2vH5z4Ggj; Mon, 20 Jan 2025 21:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737409211; 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=1fkBU6A7tWcr4U5k16RhfJFYXJHWdQEZIsgjU7rPi8U=; b=r/CNF+34WzINaI+2m9WXR6whEHdxJQRiLxkQFUsSjcBNplHqSmsHxW+zrx+7ALsGiwHgLN a4pVUQcrVGp3/ZLRbeNtgR+oQZVzyDyzxf9ozxIcr+ZwLaJYBleOThSFt60q9CCPjqWWQJ 8pOnrung9XpWhdveHScclSE26Vd9HOgIR6cpMcuV+jkbqh86bEywp50WoFz9j8pRp7j12J K3Ks5+57wUQiRy+xjO10jndsDGyZqdbbJTastkXtC6lExCYpk7st/jlXtWDKQu/vWLV4LL 7i1YKakhHmD0Aqo2YbUZ960nNbPPUYnGdw6AFjaqYL2otD8NzEZGI5WaYrzZ1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737409211; 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=1fkBU6A7tWcr4U5k16RhfJFYXJHWdQEZIsgjU7rPi8U=; b=hlveEUpdO05n1ecn05xPa5uXQIEPnalwYk3g6iJOldaWMVR4HuEkrIt9fdDFyXncv6H2qc vX/Lcu69IW8tcBmo0fB2ZqyVC9xCTvk8nODymqZWTbPf62/f51j5Kh9coH1IxorgdHs9J7 RFygB7zClGSrFQfC+q0HV1bK6YHh9Y1/ehl6SAQ7tKb7wc1w+gxr1DWb9YXIFplB8ZYNMu 5JTYShsQHyqrOw7d7No2l4pb6RxNrrUeWBNJ1/nZlP/SxhX6HMzyeawx5ujgM3AJjo/NhU qd8qXj/jrdqfzXh+qeOVd/bH9qa8wBMqYNMyQ9xZ4b4IErH3NNPP5fSTTiJDrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737409211; a=rsa-sha256; cv=none; b=xz2zUsDPAahZzmAIoFu4r2G2ygM8BB1z3ZKymE8PWCJTwvqAYVZdfNNfa1W3+mkvZBgOXi EIDuViIL83kuS6EpqzsSBo9IwBKsrya2wMQ+yD3s/O6HmguiwtBwhX9o+ahUkt1OZ03SU+ 6uX0bs3ZcgLOlLkScYqRtTvf8bQjrfIPvMrgILnZd3QJV9DDCpl+7/IYZ3YSGgXd9TEsNF TASiZOmkoi8BPCL96R2irojiSNEo6SfcEtTUK8r5BQHNGLnqws8XyNJCpJq+xSn9V5pJhm 5fWaEy9rtHjZ58a34hDT7sJycZaZ3OH5LylzA9vIuvNkrx1q4TtWW33fqY3y0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YcNzb2Ry0zf6J; Mon, 20 Jan 2025 21:40:11 +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 50KLeBrq000500; Mon, 20 Jan 2025 21:40:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KLeB2n000490; Mon, 20 Jan 2025 21:40:11 GMT (envelope-from git) Date: Mon, 20 Jan 2025 21:40:11 GMT Message-Id: <202501202140.50KLeB2n000490@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: d521362f8f7e - main - netlink: fix build 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: d521362f8f7e74178eeea1b7e333ca02a440f3e5 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d521362f8f7e74178eeea1b7e333ca02a440f3e5 commit d521362f8f7e74178eeea1b7e333ca02a440f3e5 Author: Gleb Smirnoff AuthorDate: 2025-01-20 21:38:02 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-20 21:38:02 +0000 netlink: fix build The commit checked in had a dependency on not yet reviewed changes. Revert them, but the main gist of the commit is not reverted. Fixes: f2a4eed3e13b6aeb9ddeef580d3b931cf22a14e3 --- sys/netlink/netlink_snl_generic.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/netlink/netlink_snl_generic.h b/sys/netlink/netlink_snl_generic.h index 7dc8980e1c5c..acf483ac0243 100644 --- a/sys/netlink/netlink_snl_generic.h +++ b/sys/netlink/netlink_snl_generic.h @@ -126,16 +126,10 @@ _snl_get_genl_family_info(struct snl_state *ss, const char *family_name, memset(attrs, 0, sizeof(*attrs)); - if (__predict_false(!snl_init_writer(ss, &nw))) - return (false); - if (__predict_false(snl_create_genl_msg_request(&nw, GENL_ID_CTRL, - CTRL_CMD_GETFAMILY) == NULL)) - return (false); - if (__predict_false(!snl_add_msg_attr_string(&nw, - CTRL_ATTR_FAMILY_NAME, family_name))) - return (false); - hdr = snl_finalize_msg(&nw); - if (!snl_send_message(ss, hdr)) + snl_init_writer(ss, &nw); + snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY); + snl_add_msg_attr_string(&nw, CTRL_ATTR_FAMILY_NAME, family_name); + if ((hdr = snl_finalize_msg(&nw)) == NULL || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq);