From nobody Wed Aug 3 22:49:41 2022 X-Original-To: dev-commits-ports-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 4Lyn9f0lrhz4Y24F; Wed, 3 Aug 2022 22:49:42 +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 4Lyn9d4rZHz3ZgF; Wed, 3 Aug 2022 22:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659566981; 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=EuJBwhnaxdyZRI1TCor42C+zysupp/g0IJasOmTODqg=; b=EmwzkplKcpfO8n3WoMAZAkqWVRdui2pUx+X1b+aPqH6p+jS/acCCwy0npjYxE75DBr/QYt lqn1FCbcwuWO5551aW5irzuaqZHLFWlsV0pnOMVv3TkdZLOAoAH9bH18/lDwdT7gUGirwB r5AetAuIC0ax0RbMApFUz3dqHrUfofSvr08eE64D36SpaESlvwpdJBBu/Zn2/kfmjqyahp B8b5NHoMGv1xAPSq3HCIG6IhSPRTTwKUANIXhaESOiHPHl3m3frcji0ZoYqq/FAV5pPJO2 mbLy/FIou0Gt9081uyzPDG5XkFPNP5bLeDFlsOeiU0TNSlSPM1uk1S5DeNalUA== 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 4Lyn9d3nMSz16wf; Wed, 3 Aug 2022 22:49:41 +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 273MnfcB021439; Wed, 3 Aug 2022 22:49:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 273MnfZY021438; Wed, 3 Aug 2022 22:49:41 GMT (envelope-from git) Date: Wed, 3 Aug 2022 22:49:41 GMT Message-Id: <202208032249.273MnfZY021438@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: c67225080bcd - main - net/dpdk: Remove devclass from DRIVER_MODULE on recent main. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c67225080bcd9e42984411363f2f5735b844ae5f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659566981; 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=EuJBwhnaxdyZRI1TCor42C+zysupp/g0IJasOmTODqg=; b=qb+WfnpoYSyhZXi8XIXVnZhpKasIxUX+mgFj9cvjdSgBvmYcZAfCVuNvlJSvZgjNcp4zOB LiWC9CBG4iLaOpCk/bbWhKX0PTSpQqkl2Kj087fqDBlyyR2tfw1D2sFb/WgEz7abnf8CZX zmZx1+++zu2GKPIxA7tFjvw2bjkRIhWt97DmoJBecCCoMyhfY8wrlgI95m2AHRmtuctiMw WOhF8a8E5MsaxdhwJvpG4uCjFbh4SoN/lCYC4ZUNHR9DrXv6HkKpoS8GRAiHImtOsSd0a3 Rzpl4eOOr05mpBDx4yBUT23SgNJ90GZL0YAw/6tqO2HapGNkI29e1SLFWGF/Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659566981; a=rsa-sha256; cv=none; b=K7wKuTJU8OxS7HRTXrUK7E7WvVtkqbAp6/o+OhC9opzrHku3OgMe7o7sGL3GZ+cyNonxnG Q16vMFJik7Yzt8Qncyf6UQcjvx6WeZ5SxveRvgCXjS7yX1YL3YfShh/rjDyOndhSowsrGq jUjJXQrjNFGK7hyAKdefLt+3zQSD3roolFTeymqz+eShNqMEa3CLEM5Gm5rjQPH2N/+jz3 Bun0ALojTbxE8RJZQ2GwlZWed8pZT8PB59YlllCqx0VT55f59gzbdtXwrbFOmRqDbIZKPT SGKnVdNtcZohDdBmJ3VzD0W9EOFDrls15pZ++DpOjrWn0cUuf+pFyZurhyLWXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=c67225080bcd9e42984411363f2f5735b844ae5f commit c67225080bcd9e42984411363f2f5735b844ae5f Author: John Baldwin AuthorDate: 2022-08-03 22:47:24 +0000 Commit: John Baldwin CommitDate: 2022-08-03 22:47:24 +0000 net/dpdk: Remove devclass from DRIVER_MODULE on recent main. Reviewed by: erj Differential Revision: https://reviews.freebsd.org/D35955 --- .../files/patch-kernel_freebsd_nic__uio_nic__uio.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/net/dpdk/files/patch-kernel_freebsd_nic__uio_nic__uio.c b/net/dpdk/files/patch-kernel_freebsd_nic__uio_nic__uio.c new file mode 100644 index 000000000000..d4dac8f04019 --- /dev/null +++ b/net/dpdk/files/patch-kernel_freebsd_nic__uio_nic__uio.c @@ -0,0 +1,18 @@ +--- kernel/freebsd/nic_uio/nic_uio.c.orig 2022-07-26 18:39:52 UTC ++++ kernel/freebsd/nic_uio/nic_uio.c +@@ -78,10 +78,14 @@ struct pci_bdf { + uint32_t function; + }; + ++DEFINE_CLASS_0(nic_uio, nic_uio_driver, nic_uio_methods, sizeof(struct nic_uio_softc)); ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_modevent, NULL); ++#else + static devclass_t nic_uio_devclass; + +-DEFINE_CLASS_0(nic_uio, nic_uio_driver, nic_uio_methods, sizeof(struct nic_uio_softc)); + DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_devclass, nic_uio_modevent, 0); ++#endif + + static int + nic_uio_mmap(struct cdev *cdev, vm_ooffset_t offset, vm_paddr_t *paddr,