From nobody Thu Jun 23 21:33:53 2022 X-Original-To: dev-commits-ports-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 94F4C87ABFF; Thu, 23 Jun 2022 21:33:53 +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 4LTYR53lDhz4m7x; Thu, 23 Jun 2022 21:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656020033; 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=7q3bMbrSadt8bS2a7hh55nd3Ye4gSh1+ATtI3RsIm/Y=; b=QCD2wvJBfQNjqnJ/w4yPJk45OFldE0Gv4vpnooExqtvRUN+ar0vgs6lVFRPVjrAaJT1WOl kiW2Xo/NGZMGC3xmf1zNG/8Z8Nuc1znjEvB6yyHd24c6IyWSvSdynt0M7VYaDLJjcTsLe2 oUhyjguevtzrE7s8KWZc2zydk1QZUeLQ+Dr5J3LO+N+yfMXb5eLpEraMwZzgAfNNkt34eQ pWVJnmfiXYdIBGnDFe7eytnXpo1bDGqgGMhUb55y45XhoiG5/Fgr2oIWuyY4PZOPbZHhY9 P+FvolNbz7W3u6EzCsyE3qF/Pzu67ZpJDOerGJIhnMFftjSme+/m+pL5o0tLqQ== 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 6095B22D5E; Thu, 23 Jun 2022 21:33:53 +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 25NLXrW5086606; Thu, 23 Jun 2022 21:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NLXrWa086605; Thu, 23 Jun 2022 21:33:53 GMT (envelope-from git) Date: Thu, 23 Jun 2022 21:33:53 GMT Message-Id: <202206232133.25NLXrWa086605@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: 2fd9ef9ddda7 - main - net/intel-ix-kmod: Remove unused DRIVER_MODULE devclass on recent main. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 2fd9ef9ddda7bd4bd351e2940a6614fdef26770c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656020033; 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=7q3bMbrSadt8bS2a7hh55nd3Ye4gSh1+ATtI3RsIm/Y=; b=ALdamLWuYbgCJzFfZaEWTFf8bQHRXMultTGVAV6PPeMayuIsk6ONByxby+LyhuQVjYZg2J kISpCaDEoCgDauZBUNlzWHJRELLUbDEc5T89fCtjV2n0mOtwKvcotVX9qd6kMZMNf+M3tT oUFJtZzQasdwatBMfvtQTZg0mx15diI+G8r9tJSVELMlszvPp3pqTQ4B42ZL4kJi1B5Luh 5cV9Is+VbekNoX1mqTGD2SvahqpWrdDvt6J7rxdmAbro3WrI8Jr0W2a/0yUzJGfrh5f/FT 07PHwZMQxB44LjJK8+8bXIYkChrAhzPB6RMDcfepgukc74UZv6BWqbID/5l2Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656020033; a=rsa-sha256; cv=none; b=FcYE2qHwj3ZbpSdMb6W7kfeTrX+ryecRXup4kKnUjvdZwcMfySsvI8NILd3CLRX9idKg6U 1cPyPGKK9Kk7SWVfLwUWjT7wi5Z6Of3o5+/oDXxAxBQCXB1dlW68rp+jUUe8FzrQh8xost /fdHa2cl2BD7UyEid2fEI+jPuLKQkCGmezEaRSfBX3E3bIRolY2W36wFv+L9XmF+eOxmrO EaId+tLAeYmh4VfgZGDzSp8JEO1FGzvtXH0kJg2Dvjas4oeQq4G5C5Xd3i2pTfo9l2POEC XSr+w1j0eQqozyQmFuQXBUWkhsnzmtA2kE5gZ0y+m5pAzAUGNZ122XxtBD5BVg== 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=2fd9ef9ddda7bd4bd351e2940a6614fdef26770c commit 2fd9ef9ddda7bd4bd351e2940a6614fdef26770c Author: John Baldwin AuthorDate: 2022-06-23 21:31:37 +0000 Commit: John Baldwin CommitDate: 2022-06-23 21:31:37 +0000 net/intel-ix-kmod: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35201 --- net/intel-ix-kmod/Makefile | 1 + net/intel-ix-kmod/files/patch-if__ix.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/net/intel-ix-kmod/Makefile b/net/intel-ix-kmod/Makefile index 2995c68ea9e7..d3bb5edf94dc 100644 --- a/net/intel-ix-kmod/Makefile +++ b/net/intel-ix-kmod/Makefile @@ -21,6 +21,7 @@ MANPAGELINKS= ix if_ix if_ixgbe MAX_NETMAP_OSVERSION= 9999999 MASTERDIR= ${.CURDIR}/../intel-ixl-kmod +PATCHDIR= ${.CURDIR}/files PKGDIR= ${.CURDIR} DISTINFO_FILE= ${.CURDIR}/distinfo diff --git a/net/intel-ix-kmod/files/patch-if__ix.c b/net/intel-ix-kmod/files/patch-if__ix.c new file mode 100644 index 000000000000..89b9ce285111 --- /dev/null +++ b/net/intel-ix-kmod/files/patch-if__ix.c @@ -0,0 +1,15 @@ +--- if_ix.c.orig 2022-05-13 22:10:39 UTC ++++ if_ix.c +@@ -241,8 +241,12 @@ static driver_t ix_driver = { + "ix", ix_methods, sizeof(struct adapter), + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(ix, pci, ix_driver, 0, 0); ++#else + devclass_t ix_devclass; + DRIVER_MODULE(ix, pci, ix_driver, ix_devclass, 0, 0); ++#endif + + MODULE_DEPEND(ix, pci, 1, 1, 1); + MODULE_DEPEND(ix, ether, 1, 1, 1);