From nobody Wed Apr 26 11:19:49 2023 X-Original-To: dev-commits-src-main@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 4Q5xGs55bqz47rW6; Wed, 26 Apr 2023 11:19:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q5xGs4Bljz3qV5; Wed, 26 Apr 2023 11:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682507989; 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=FJkcVynPdu5qcBMvECYYwhegVO43Uqz6XvuAoHYBqys=; b=QK3b1hUwRxzUob96fK+J7TgQM/Ty6opqDIowdsk/1IZDQPyFMFcA1/dAKlmrLLfYi8jReS qkvt02B+RLQNFy8CAq12SAT/OzgkMT6J7uDf2Ac8Lu8lZYOURagkwZ4glUqtYSerQmt+SG WdvqkLc81ZCU7D16ccP1gpqH4SxsXPgFns2oMnhCHgFxSbFc16YthYLp+NZdwLgpobeeyC mqbjn7mBTWQrgrsqn+dfoekWXtRdhvuAF69qrLmLDepCzj6VjsoB+bMDNB7Jw+1x0HLF9g osVBuA3ucF3JXn1cEIr2ZpPtR+lP87klPJp+SVITV5g01T+Qjs03nq485JnyNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682507989; 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=FJkcVynPdu5qcBMvECYYwhegVO43Uqz6XvuAoHYBqys=; b=DmzpSYljXnxjVK1aBn9uqldygF0ONVP+6OUJ3jPttzwQxpWc5v87s6cv6YF3UZ0NJkTaMk TZBuVMzCozcsPSh65RSpHRaEpLJherr7RZPGt5y5KNUHj0s2PISZIGf0NeL1pcagZVaXPo z4Eb0bpJv4TqcOVBKsVJKn2slTVTDxCsaSMcl0G65H85OSHmGro/pB8z19q54txIHJRX1P F4pCKMNtXMzrPrQWIhPHrb3STlOxiFr1fipdDblh1rW+VAodECoYw8z4RnvDBP1y0h0ffq 9g6KnaZQnoehzy3qj3GGyQhckKl1x74w2ufPsEh16jFgrUPKzebDEsybtn6vKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682507989; a=rsa-sha256; cv=none; b=xoVhzwGTuSS5MpWQOyMM75gZrfutLH751kYywBJpGI/t8OPfBx4HyIUVP2xmuO+UiXnVTn NWY56sBWySS7tZunaO7VfOkTNvxoLNUt85vYS5nb1C/AeFjhDElIvbGd85RRD2RcL3+5UR nY6i/LtAXfH9sgE6XIoq47QYVDBbyJvlKDOgFA18tmNEPHJt221V2VQJgHvJUMa3nH81nz KUNCGnfzSyA9qshJxyeEBQ3QxuiXKQrVonFe+Mea5Cq88rgqmAE5r4476bSLdMMydm4Ltl Cqx07iM/XBlSDrPOceutiG+NYGNAWbBYgBjmHJf1OQUPprZEEZ4YbJMmDGd0Sw== 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 4Q5xGs3H9XzXmk; Wed, 26 Apr 2023 11:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33QBJnxf090488; Wed, 26 Apr 2023 11:19:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33QBJntk090487; Wed, 26 Apr 2023 11:19:49 GMT (envelope-from git) Date: Wed, 26 Apr 2023 11:19:49 GMT Message-Id: <202304261119.33QBJntk090487@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: a1db1097e654 - main - netlink: fix build without NETLINK in the kernel. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1db1097e654272c1af0a1e0581b4a8deb75f168 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=a1db1097e654272c1af0a1e0581b4a8deb75f168 commit a1db1097e654272c1af0a1e0581b4a8deb75f168 Author: Alexander V. Chernikov AuthorDate: 2023-04-26 11:18:43 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-26 11:19:41 +0000 netlink: fix build without NETLINK in the kernel. PR: 271066 --- sys/netlink/netlink_glue.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netlink/netlink_glue.c b/sys/netlink/netlink_glue.c index 069cb9900e03..940ff2de4859 100644 --- a/sys/netlink/netlink_glue.c +++ b/sys/netlink/netlink_glue.c @@ -49,6 +49,7 @@ #include #include #include +#include /* Standard bits: built-in the kernel */ SYSCTL_NODE(_net, OID_AUTO, netlink, CTLFLAG_RD, 0, ""); @@ -282,11 +283,11 @@ int nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, const struct nlattr_bmask *bm , struct nl_pstate *npt) { - return (_nl->nl_modify_ifp(ifp, lattrs, bm, npt)); + return (_nl->nl_modify_ifp_generic(ifp, lattrs, bm, npt)); } -static void -nl_store_ifp_cookie_stub(struct nl_pstate *npt, struct ifnet *ifp) +void +nl_store_ifp_cookie(struct nl_pstate *npt, struct ifnet *ifp) { return (_nl->nl_store_ifp_cookie(npt, ifp)); }