From nobody Mon Oct 9 23:16:32 2023 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 4S4FKF1M33z4wgs9; Mon, 9 Oct 2023 23:16:33 +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 4S4FKF0RpZz3RlP; Mon, 9 Oct 2023 23:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696893393; 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=tOSbKZ+Vk8MSxY4LKttu1xIGFQCZiNR8u1XPm512z38=; b=SjqZlMbWgIvZsmVFpiOgpW6QKJmM+lZFflCA2xU8zgWBcvxjD5U4lmfkIugBM+cf6436/k gJJX6H0CC1286ot701Ad6SO/WIUw8jr3rA+i3nqq7wEVmIrnP9zj5/f36iCP2DnCuPK0gq JkJCCrbdCb31b7D961lN/5W3gyKC3SYW11YSwGsRDZZxwjnqaFqIyCUS+S17VhJrxOc6z5 i3fcC5IKMa6+gEzp0kRi6B2Wh5lXK5OvuScvvDFZ1SaIQqHH8ELxgr0ma7zg3QEK/1ejA7 M2eckOOIYMJRMsdn1Inxpd1DeFsN7tISJrMVIX40wvK2rEcOpvYkwGki/LvSGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696893393; a=rsa-sha256; cv=none; b=HFH18xY6SZIJzzg7dDi6XrqJl+PiHYaHOtZih9qqWxXy5yBRX/Qk0D+dU1GeqCG/sA5i62 dU/Y7bak56crNzZ/6YNH0Qvv7Lavn3g3v64t0XgCCiItnyltRzrpyUXf45MoG+0jRuq3nm vGZnOxX3v0LQhaOA1rJUr0vo5BdzgdatS4pWV6D+pmckm22mkuqHxF/hUh+mnHymitvL1k RxZPQBWJuJZcMYe3vF165K8Lw5+iax3k9ITnJeLwEHjtSMy+p8TGySgg+fPq3scrwUAvGm bDtHrPlXyEAY8UWsEQOciBgykqVbgAsOQqpAm4XXHSO+jkKp52LhU+8bIW+7Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696893393; 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=tOSbKZ+Vk8MSxY4LKttu1xIGFQCZiNR8u1XPm512z38=; b=ks23hDjwfZvmQ1YHXRlZVHrUmMS9vkUC86OULC+tc5G6FH5psPIiQS8whMwZd0z3E05vhI Lta/LAmL4qrtKUShzFguWn9Z8GZ5nI16bRohOOdHRK2jp5DOJIga1zw1TGa/v+wUBI0faD mL3UU4HspbemOKQe5be+GRaecD9+voFf/xZAhmQACe1Zf5KoFYcg9jbVKjZGuP1EZvHOlp EU3z8BvODdeW5rq7VXxS0d6ZJF0hia/wsU4j6XGvMKcXCqbjxE3njWuAcLHWM6cNe3aGPk UlUrXPq5Zw9058fhzvYEUSCBOf/IoIvHSgQo6XykIXDVVyHsAfXc857Y9LLFXA== 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 4S4FKD6YBGzl9; Mon, 9 Oct 2023 23:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 399NGWTd072072; Mon, 9 Oct 2023 23:16:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 399NGWPQ072069; Mon, 9 Oct 2023 23:16:32 GMT (envelope-from git) Date: Mon, 9 Oct 2023 23:16:32 GMT Message-Id: <202310092316.399NGWPQ072069@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: bf1c8af905f1 - releng/14.0 - iwlwifi / rtw88: re-attach to build after updates 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: bf1c8af905f11b341e08ed4a1685772b6059f820 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bf1c8af905f11b341e08ed4a1685772b6059f820 commit bf1c8af905f11b341e08ed4a1685772b6059f820 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 17:12:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-09 23:14:55 +0000 iwlwifi / rtw88: re-attach to build after updates While the build-breaking changes were only in a smaller window further updates restored some functionality as well. Now that we are done, add iwlwifi back to the build. Sponsored by: The FreeBSD Foundation This also adds the (updated) rtw88 driver back to the build. Functionality has not been tested (much) so might not currently work but people offered to test. Approved by: re (gjb) (cherry picked from commit af6aaa90057d75644c41527acc903082104e4114) (cherry picked from commit 299e2d5724c2bc4929b6eac3258f04055e97992e) (cherry picked from commit 7ec227367ed748011a97540296b0935de877cc5a) --- sys/modules/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 66d7c895a460..4b98c7ed6e0d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -561,12 +561,12 @@ _mlx5ib= mlx5ib ${MACHINE_CPUARCH} == "i386" _ena= ena _gve= gve -#_iwlwifi= iwlwifi +_iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw .endif _ossl= ossl -#_rtw88= rtw88 +_rtw88= rtw88 .if ${MK_SOURCELESS_UCODE} != "no" _rtw88fw= rtw88fw .endif