From nobody Thu Mar 27 01:28:52 2025 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 4ZNQzS3trhz5rW3S; Thu, 27 Mar 2025 01:28:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNQzS1b2Hz3R7K; Thu, 27 Mar 2025 01:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743038932; 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=/LfLYGmjs3svROTAXoIXB6StFe40Ek25iG3ONyfdM0w=; b=BkTzO3CcHnENixQXykx2SbSEmHBGNP5gCFGttxsDZuTG1ylj9poxG1hZ6jd/vE7CRF66qD bKaUlf2EEGg5oU5rprHPibrWrLvBW8U6qJMXZVRL1zQ10O4nu32CXLuJzojpnsoaLKTdep eHadD05ZCMS4S/g6vzmIFgWgm7J3vS0cEFOx5xt/JnxRdFn9h8etGW5vWYrKBljMBpZaXW 26ltJThb9yUiQa5ksKV95jONgDUOwksfLNzbNJwY6xmGSH50DCsM9d4berbQqf0LyBDaI4 i9UK1sAqhQSHI5s+6nXcpOBjtW7ximM8868btYpLEnGE/a4Pr4VMXmtGKApT0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743038932; a=rsa-sha256; cv=none; b=b2bKGy62gSJY3tzdRezxJMxe8dOndMMhEGWm92anwOp1EhkVUpJRj+Vp9dnzIjdxsSaSsE lQFZHdvi0UXmr1lb59C1PmVuZtdAB3ZhBYbAbDkcGzSZcIpBEFHTqxHxB8Sr25vCMmINXn VV87EjUz5L5wONX7/k1tkdDM8A44/aUSK2uWlK2eHO4Gt8GbXOA6USuawgOfYy3RF2JgrM Vz8AYlBZIFrvrPIFDx06kmXwy9GDep6loJCXEMHks2/uUFkaQSsfZ0T9I5ypugGHvDgF0B HvR3HeV7wuNq82if0EmrvvPPfQHTSuSemETVnFwH7ge+R8ybvvWBuVa1fGYiHA== 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=1743038932; 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=/LfLYGmjs3svROTAXoIXB6StFe40Ek25iG3ONyfdM0w=; b=wevWE0JGUX74Dn0EfxnnOGZdR/vPi8Pcl3VqHHE/vKY/81kd2b1nKqmCoJ5zVwQU8fCoBo srSWUUTGS84tukTNpUDxacNfNmDylt1rl4g0QhtU/9kNvAKVLdbhJUJwdpqWtbGbgBOefe d5hp7V5WfBFZcxPzzpCTLHba1KYccRk4fZdobtwQig9zERdQ7wiyDMiV4OgR0g+tPf58vs xhIM5MKMu9v0s//MNWJt/ROaupR410JLoVK9tdiuHUT/JSnfF7oqqvzn978mBa+YFtfv41 W/nvnT4bzADQTmbphy/ZKg1gb7K/7T1NH8YPEb+Ra+4DyTEfNuB81yzNFYR1Sw== 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 4ZNQzS19rQzcGY; Thu, 27 Mar 2025 01:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52R1SqKu039838; Thu, 27 Mar 2025 01:28:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52R1SqX9039835; Thu, 27 Mar 2025 01:28:52 GMT (envelope-from git) Date: Thu, 27 Mar 2025 01:28:52 GMT Message-Id: <202503270128.52R1SqX9039835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 7bf82ea4fdda - main - sys: add wlan_gcmp to GENERIC kernels as appropriate 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bf82ea4fdda4fa2aa15cf690f7a64d66024eaad Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=7bf82ea4fdda4fa2aa15cf690f7a64d66024eaad commit 7bf82ea4fdda4fa2aa15cf690f7a64d66024eaad Author: Adrian Chadd AuthorDate: 2025-03-13 15:08:34 +0000 Commit: Adrian Chadd CommitDate: 2025-03-27 01:28:46 +0000 sys: add wlan_gcmp to GENERIC kernels as appropriate Add wlan_gcmp wherever CCMP is defined in kernel configs. Differential Revision: https://reviews.freebsd.org/D49343 Reviewed by: bz, cy --- sys/amd64/conf/GENERIC | 1 + sys/arm/conf/TEGRA124 | 1 + sys/conf/NOTES | 3 ++- sys/i386/conf/GENERIC | 1 + sys/powerpc/conf/GENERIC64 | 1 + sys/powerpc/conf/GENERIC64LE | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 923574adf943..6921c1d73a58 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -283,6 +283,7 @@ options IEEE80211_DEBUG # enable debug msgs options IEEE80211_SUPPORT_MESH # enable 802.11s draft support device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support +device wlan_gcmp # 802.11 GCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124 index 058a85955a04..ad5532427eda 100644 --- a/sys/arm/conf/TEGRA124 +++ b/sys/arm/conf/TEGRA124 @@ -108,6 +108,7 @@ device ums # USB mouse #device wlan # 802.11 support #device wlan_wep # 802.11 WEP support #device wlan_ccmp # 802.11 CCMP support +#device wlan_gcmp # 802.11 GCMP support #device wlan_tkip # 802.11 TKIP support #device wlan_amrr # AMRR transmit rate control algorithm diff --git a/sys/conf/NOTES b/sys/conf/NOTES index aedb89e49b67..fc32acd681b3 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -889,10 +889,11 @@ options IEEE80211_SUPPORT_MESH #enable 802.11s D3.0 support options IEEE80211_SUPPORT_TDMA #enable TDMA support # The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide -# support for WEP, TKIP, and AES-CCMP crypto protocols optionally +# support for WEP, TKIP, AES-CCMP and AES-GCMP crypto protocols optionally # used with 802.11 devices that depend on the `wlan' module. device wlan_wep device wlan_ccmp +device wlan_gcmp device wlan_tkip # The `wlan_xauth' device provides support for external (i.e. user-mode) diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index e7851f7eb92c..e7d460af21d4 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -248,6 +248,7 @@ options IEEE80211_DEBUG # enable debug msgs options IEEE80211_SUPPORT_MESH # enable 802.11s draft support device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support +device wlan_gcmp # 802.11 GCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 9a363a5471a1..85711c8fc3ff 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -235,6 +235,7 @@ options IEEE80211_SUPPORT_MESH # enable 802.11s draft support options IEEE80211_DEBUG # enable debug msgs device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support +device wlan_gcmp # 802.11 GCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 6aeb188d7501..a56feb6574a4 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -231,6 +231,7 @@ options IEEE80211_SUPPORT_MESH # enable 802.11s draft support options IEEE80211_DEBUG # enable debug msgs device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support +device wlan_gcmp # 802.11 GCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs