From nobody Mon Dec 27 19:11:47 2021 X-Original-To: dev-commits-src-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 344841926D3E; Mon, 27 Dec 2021 19:11: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 4JN6jJ1NFwz3vvj; Mon, 27 Dec 2021 19:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C5E20233E6; Mon, 27 Dec 2021 19:11:47 +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 1BRJBljl037636; Mon, 27 Dec 2021 19:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BRJBl6N037635; Mon, 27 Dec 2021 19:11:47 GMT (envelope-from git) Date: Mon, 27 Dec 2021 19:11:47 GMT Message-Id: <202112271911.1BRJBl6N037635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 81ff67ffbec0 - main - iwlwifi: also depend on linuxkpi_wlan List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81ff67ffbec066bc5014a64e67de0219d943156a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640632308; 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=Y89qEVkjuNaGh36o7i0H0+LoTGn+D5ZgHLwGCugjZck=; b=tcUVMOrzZzqk1eDVXcC+6l78R02zRgBmf2rSQq5LV2UTKwTZFddtBnH9jIVP8SkjJReFWr wjESNHSDTe831vCuD6obPeInUJWaKIVi0D1zXUp/xrLOGPtN2/CeP9YAKPULTPglJB3EOp VRyKpnMzM3o689OMBIPZHt0gVR01XO4EkabkoG2jfr3zmmOqvKs09TyHvqcexK2LOq93JN q7auxMe2k5HNubHRwyw9293m9RH9227eI9GHOIfIbWWMPFFrpY7jJV9pz5q760dEar5SsM lijBpf3dBwb8snZmpykf2mHYhXSLU7L4T6JgkvZPjtezpd+NBwNEtRwouKITBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640632308; a=rsa-sha256; cv=none; b=vcAOtdAsxjc/qRMudEWoxaNc3DyskXcV9zJBulHKTq7YzsfTHut69PHyPrWpSoV6IiNeix pXkFA4aBC1SVWiR6iQ3W1UEbq71euQXKQvnHXcfVfmTVnf8k/0JYacVIYMYI1v2S/5kLnF vnXuyBlxG5bmRhdwrkSblE2Tv6rArxha9vdDpVTHvTYLXUKy0dfKxNH2wRZ0do1U6f3GoG EWtE8mNMGInPdMIUA0RliuGnV/6T6wEa3+XGRD7/Jw/xd1P6MXqFTa4H04GMv8kiVX9ZJr VrzzXxOyzBqXL/U2/10zDUlxY4I5vVh99R8psRWoQ8fPYuEgFliOQZSM2sBdBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=81ff67ffbec066bc5014a64e67de0219d943156a commit 81ff67ffbec066bc5014a64e67de0219d943156a Author: Bjoern A. Zeeb AuthorDate: 2021-12-27 17:36:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-12-27 18:47:25 +0000 iwlwifi: also depend on linuxkpi_wlan The 802.11 compat code is split off linuxkpi.ko into linuxkpi_wlan.ko in case it is built as a module. Depend on that. While here adjust our module to a longer version to avoid conflicts. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/iwl-drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/iwl-drv.c b/sys/contrib/dev/iwlwifi/iwl-drv.c index 4486920f59e1..0725e755f4a3 100644 --- a/sys/contrib/dev/iwlwifi/iwl-drv.c +++ b/sys/contrib/dev/iwlwifi/iwl-drv.c @@ -38,8 +38,9 @@ MODULE_LICENSE("GPL"); #elif defined(__FreeBSD__) #define DRV_DESCRIPTION "Intel(R) Wireless WiFi based driver for FreeBSD" MODULE_LICENSE("BSD"); -MODULE_VERSION(iwl, 1); -MODULE_DEPEND(iwl, linuxkpi, 1, 1, 1); +MODULE_VERSION(if_iwlwifi, 1); +MODULE_DEPEND(if_iwlwifi, linuxkpi, 1, 1, 1); +MODULE_DEPEND(if_iwlwifi, linuxkpi_wlan, 1, 1, 1); #endif MODULE_DESCRIPTION(DRV_DESCRIPTION);