From nobody Thu Dec 30 19:22:48 2021 X-Original-To: dev-commits-src-branches@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 454FA191FF18; Thu, 30 Dec 2021 19:22: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 4JPypg4jVrz3C0s; Thu, 30 Dec 2021 19:22:51 +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 429471E0C5; Thu, 30 Dec 2021 19:22:48 +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 1BUJMmHk017567; Thu, 30 Dec 2021 19:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BUJMmh6017566; Thu, 30 Dec 2021 19:22:48 GMT (envelope-from git) Date: Thu, 30 Dec 2021 19:22:48 GMT Message-Id: <202112301922.1BUJMmh6017566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8099a895d916 - stable/13 - iwlwifi: also depend on linuxkpi_wlan List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8099a895d9162ace638412c5c21fe9f8e7625154 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640892173; 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=UpbFHW3HfsNiv39LiYqP3rJKEI+6PbEb7IgNhN16ZxA=; b=O7/aTvSo0GlRQ6tGj+4UqVSBApTbr9gXcGAQuV1oojdiscuPPG1zejBwJqF4LuHAWpmQbC y1K3kfbyJt0KHvFFRxlfuKbFIbZYVfvIfdRTzYXMpKdmJtrGQfcWad/PaE6jKgUTQCQm7W AeGO8ddlfGCxTh12KNjmeG3Ccqk9RORsn3/fT58mIVWzbS6YmyNLEjjKUYkQdn12BuGHdQ lkUP+1HSKkWhvehEvQ1KIh4WzhckApPNezJlEt7NC3299RgpSOzf66IsFKLOsaZTaL4vc9 y8/+AqIoDK+o2dVtIoQXoP0l1ZYH9+0CAZdCQDLXI69NrSO0rZcau1tnESB7ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640892173; a=rsa-sha256; cv=none; b=hRakd09YvgdE2ZUodBBnFbPTyhHF2HkWK/7l9txy82uQyE/7JKXXZLXqkhrReB7FhhKkki 8D0GygKiM53uVJtTxqTwszAlOnRiGKfPDF+F3Kq033ZuGsEyLnSgg4tbEpwB682ZkOfgeh 79n0XQ4C04WcBPKc9GqtYPgxq/re1aLBC9Mu/Seg6tKFM8Du+QqOVg6cNCxY9W2V6p4ctr OE4JQ5cXFnzkqIxm8MGsYmdmAj/EEKMCDVXUnpmWYdNxFeZc8znpmIE9TlQR1RArhfHDgt 4bL6/htHW6JWA8Nu79IXE7/0z9Iy1JiOTDmys0z8ULpK3egMlO2ggwWNrMEh+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8099a895d9162ace638412c5c21fe9f8e7625154 commit 8099a895d9162ace638412c5c21fe9f8e7625154 Author: Bjoern A. Zeeb AuthorDate: 2021-12-27 17:36:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-12-30 18:28:11 +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 (cherry picked from commit 81ff67ffbec066bc5014a64e67de0219d943156a) --- 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);