git: 7bf82ea4fdda - main - sys: add wlan_gcmp to GENERIC kernels as appropriate

From: Adrian Chadd <adrian_at_FreeBSD.org>
Date: Thu, 27 Mar 2025 01:28:52 UTC
The branch main has been updated by adrian:

URL: https://cgit.FreeBSD.org/src/commit/?id=7bf82ea4fdda4fa2aa15cf690f7a64d66024eaad

commit 7bf82ea4fdda4fa2aa15cf690f7a64d66024eaad
Author:     Adrian Chadd <adrian@FreeBSD.org>
AuthorDate: 2025-03-13 15:08:34 +0000
Commit:     Adrian Chadd <adrian@FreeBSD.org>
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