From nobody Thu Jun 23 21:33:55 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 77C3E87AE52; Thu, 23 Jun 2022 21:33:56 +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 4LTYR800rvz4m1J; Thu, 23 Jun 2022 21:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656020036; 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=Gron5+gJZZLCl9YVxd9426veJjI/9jfLyn8X7GwTIJw=; b=Nh880TU9iuYny14tLoONNkAFaT7QAj3z+Gle7Y4JiZtn/U7I00pO58LxcngTpXNOE10vAF jbsFJlbXtSaNnqBiAptcVjprOJavSdCA1SxgBxn+sqiW32CaHtu14R8AzkXidmHJPimsql 2FOqor0gM9zrmCYhur2KrOlVaEghdAF/yWqrKb9e8C0rTrA/VHCDGwCaGFcGbNuR6MR6st bei+BR2SA5dlBzFvMKvIk7JDigrnTOtFQ2ZLmP/7m6EldzPD4rN8xQP/yPaySwR2s0zARx RPDw+IX/OK60H/tFOXnHrOsfZcWoYBX7tucLjURC1UHhihsxfkFdjwgVntwkxA== 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 9F11022EEC; Thu, 23 Jun 2022 21:33:55 +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 25NLXtSL086659; Thu, 23 Jun 2022 21:33:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NLXtnN086658; Thu, 23 Jun 2022 21:33:55 GMT (envelope-from git) Date: Thu, 23 Jun 2022 21:33:55 GMT Message-Id: <202206232133.25NLXtnN086658@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: 1c8493924bf9 - main - net/intel-em-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: 1c8493924bf9039963e987ffbeaebc7a3686f71d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656020036; 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=Gron5+gJZZLCl9YVxd9426veJjI/9jfLyn8X7GwTIJw=; b=YPBZkORpZ71+OYhAmK1oxtIFpksjcsgw91kezkZ/OxKdSNEygfvMzccHKcpkTUZmdJL4NW xH05Y8D9gomNVKSQxtaca9XBYejnBSLQnBGSdKAjDG4/QkdFFYmhkuzU70gt74v6bgCcIw KuYKwxlsWfh5T02Nl+pvSUiYgAvD5IhMOGBMY8fQrk0582jk6PTOnAhPtYNidgqxRgNIAI t+UTUyfyR/BRWHla/u6IhdrzOqJVgJka7TASODnUnIMvOPTP3naLEN5KfNRja6eMyqaXpB +pmnUQfGaM4DVpw322AkODbwe6d7y269+XqGWg6SZ6PJe47qEVRB8bx1W/XaGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656020036; a=rsa-sha256; cv=none; b=LJ+w+hXzHCUzeh3n1VH8j+AX7JMDVbq2NH76T7Wyyn0MH7/GBSgRxkCzatR6jZX1K7DjdI tTJrkhCr+RlkgniSzqth8mLQkcqNd4Rp4yUs4gVfPu8bgistZ0YOcJueZCesZIHQKfLUCa CkJqWqAxtq7h0wdXvPAwFwL1RJADXClYBlroqnfcDRvcjdTb83UXPlomeww8wTwh4DuNy3 QpbCCSn727A5jJOUrBuoLVIUScUIZxLlrN4JfAJPFTWujnogZE1PRTCieHv6PBC0Zmc5xT 070ekl5FcD7kubY3SKqpXDzwPdqdYg9dWM9AJi6Bhi1RR8i4eEFVk7BmTazucg== 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=1c8493924bf9039963e987ffbeaebc7a3686f71d commit 1c8493924bf9039963e987ffbeaebc7a3686f71d Author: John Baldwin AuthorDate: 2022-06-23 21:32:38 +0000 Commit: John Baldwin CommitDate: 2022-06-23 21:32:38 +0000 net/intel-em-kmod: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35205 --- net/intel-em-kmod/files/patch-devclass | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/net/intel-em-kmod/files/patch-devclass b/net/intel-em-kmod/files/patch-devclass new file mode 100644 index 000000000000..27533cd7825a --- /dev/null +++ b/net/intel-em-kmod/files/patch-devclass @@ -0,0 +1,30 @@ +--- if_em.c.orig 2022-05-13 15:26:41.055245000 -0700 ++++ if_em.c 2022-05-13 15:27:11.443359000 -0700 +@@ -379,8 +379,12 @@ static driver_t em_driver = { + "em", em_methods, sizeof(struct adapter), + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(em, pci, em_driver, 0, 0); ++#else + devclass_t em_devclass; + DRIVER_MODULE(em, pci, em_driver, em_devclass, 0, 0); ++#endif + MODULE_DEPEND(em, pci, 1, 1, 1); + MODULE_DEPEND(em, ether, 1, 1, 1); + +--- if_lem.c.orig 2022-05-13 15:26:44.154782000 -0700 ++++ if_lem.c 2022-05-13 15:27:38.402591000 -0700 +@@ -289,8 +289,12 @@ static driver_t lem_driver = { + "em", lem_methods, sizeof(struct adapter), + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(lem, pci, lem_driver, 0, 0); ++#else + extern devclass_t em_devclass; + DRIVER_MODULE(lem, pci, lem_driver, em_devclass, 0, 0); ++#endif + MODULE_DEPEND(lem, pci, 1, 1, 1); + MODULE_DEPEND(lem, ether, 1, 1, 1); +