From nobody Wed Aug 03 22:49:42 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 4Lyn9g0XPCz4Y2Bc; Wed, 3 Aug 2022 22:49:43 +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 4Lyn9f5pvwz3ZgT; Wed, 3 Aug 2022 22:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659566982; 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=GVu4iS9W0z6s2XybrDiiao852J2qvxdBNfbX+0wT4w0=; b=vYH2ArAL4kM73ouGEUtmkyGwS+DXHtrPghe+V9Qc2HDETE8qMCelsFYpHc47T3NNQPvFNs i970OLvJz8oEVqJ0fF1atlkpxq469RiNbVzCSXkEYQzb8hCkqCBSNbjCukyiNxv52b9nKE TeqBe17ySgjZYbsYxKM59zeHZ6UPLny6zreSFj9XB1u8M8kqlSuLfBF4d1jODohFiN/tQJ hMlAbZbxXF/vw9LMFSR+TS5F3hBT8iyVf982g55HwrQnklPSM6BjEByNNa/RjuetqH9RZb cBuRxyvGISidQcBCfoLYuRXjpWSQfZKFLTUAx3ensTdtEQ6VGwdyYpEhzeeEzw== 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 4Lyn9f4kZbz17G6; Wed, 3 Aug 2022 22:49:42 +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 273MngOF021469; Wed, 3 Aug 2022 22:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 273MngBB021468; Wed, 3 Aug 2022 22:49:42 GMT (envelope-from git) Date: Wed, 3 Aug 2022 22:49:42 GMT Message-Id: <202208032249.273MngBB021468@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: d2badf4e4136 - main - net/dpdk-20.11: 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: d2badf4e41360c7a17b9ae83b4290c74982db9c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659566982; 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=GVu4iS9W0z6s2XybrDiiao852J2qvxdBNfbX+0wT4w0=; b=JOdTv9pt54XXJg/O+D0UXCrBk4ixsP/5dECivF+T3NPcHqQPcdOyVYFV9yeIpXDyV0x5c/ VZkDYWl7XF6vR0kXPd0ClLD86N0vhIo72jvks2AF+1f80di7M0OaFEg/m3UU96SULRh9ky jBS02D3yqB+ElmcK40yKpZdF1WRRt/xq6HQ+anADE6azCbLJ716ycTgWtabgnrG1jnkUEv AdRH+UetqAcqfcIf3kuVJEv33a45XpFd8icJCXDVskECkzoEyTuQUUFaItuE0VD3toVvdE hOSEJEaTO5BlCK2sIzU4bb2svF3swh3UCnWoZ7S5PlKabMQ/1FqDBU1wZ54AFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659566982; a=rsa-sha256; cv=none; b=HnQmb5JrF/rLZgFPB6Eq55NnI1TF0MlOFXTkgyREUMc8AembhoPpoHHUTn5+W8jFtPtP9d LdDt075HL9t9/WzxwLYFRlmgEt7xp7KcvtVe5CDJvHVeuhtCf0k8tslXL5d0/h9ELcmbND v0H09y8qz89hdCWgn7+nhKFIixWxISY8eBM+OsPJMn9+eEdKaUwG+PPu/kEQ3r77EyIWkT 2oTRaHsHPaadGE9C3b8QlIfaMBAA8jwDlvTNun7sYgT63PSpUttUjDU0iTr+Lj0OfnC/zA C7tY2QvZePgGqeziF6xB7HgkiyboW3kbeC2bZtMTHn+ZSNfMykodOpAX/CCWzg== 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=d2badf4e41360c7a17b9ae83b4290c74982db9c1 commit d2badf4e41360c7a17b9ae83b4290c74982db9c1 Author: John Baldwin AuthorDate: 2022-08-03 22:48:46 +0000 Commit: John Baldwin CommitDate: 2022-08-03 22:48:46 +0000 net/dpdk-20.11: Remove devclass from DRIVER_MODULE on recent main. Reviewed by: erj, bruce.richardson@intel.com (maintainer) Differential Revision: https://reviews.freebsd.org/D35956 --- .../files/patch-kernel_freebsd_nic__uio_nic__uio.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/net/dpdk-20.11/files/patch-kernel_freebsd_nic__uio_nic__uio.c b/net/dpdk-20.11/files/patch-kernel_freebsd_nic__uio_nic__uio.c new file mode 100644 index 000000000000..27bd60e20b78 --- /dev/null +++ b/net/dpdk-20.11/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:52:05 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,