git: 47acc6846564 - stable/14 - sys: NOTES, GENERIC*: Re-order 'wlan_tkip'

The branch stable/14 has been updated by olce:

URL: https://cgit.FreeBSD.org/src/commit/?id=47acc6846564609d4fe01a94357e81044e055842

commit 47acc6846564609d4fe01a94357e81044e055842
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2025-09-09 12:03:59 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
CommitDate: 2025-10-10 17:15:48 +0000

    sys: NOTES, GENERIC*: Re-order 'wlan_tkip'
    
    Re-order the devices in order of appearance of the related technologies,
    so 'wlan_tkip' before 'wlan_ccmp'.
    
    No functional change (intended).
    
    Reviewed by:    adrian, emaste
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D52444
    
    (cherry picked from commit c1eff1d745a1193c199f735733e376161c69b12c)
    
    The original commit has been modified not to include the changes related
    to 'wlan_gcmp', which are not in stable/14.
    
    The original commit message above was reworked to reflect the actual
    commit content.
---
 sys/amd64/conf/GENERIC       | 2 +-
 sys/arm/conf/TEGRA124        | 2 +-
 sys/conf/NOTES               | 4 ++--
 sys/i386/conf/GENERIC        | 2 +-
 sys/powerpc/conf/GENERIC64   | 2 +-
 sys/powerpc/conf/GENERIC64LE | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index c4177429c999..98a08c18cbd9 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -286,8 +286,8 @@ device		wlan			# 802.11 support
 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_tkip		# 802.11 TKIP support
+device		wlan_ccmp		# 802.11 CCMP support
 device		wlan_amrr		# AMRR transmit rate control algorithm
 device		ath			# Atheros CardBus/PCI NICs
 device		ath_hal			# Atheros CardBus/PCI chip support
diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124
index 058a85955a04..58a9f738510b 100644
--- a/sys/arm/conf/TEGRA124
+++ b/sys/arm/conf/TEGRA124
@@ -107,8 +107,8 @@ device		ums			# USB mouse
 # Wireless NIC cards
 #device		wlan			# 802.11 support
 #device		wlan_wep		# 802.11 WEP support
-#device		wlan_ccmp		# 802.11 CCMP support
 #device		wlan_tkip		# 802.11 TKIP support
+#device		wlan_ccmp		# 802.11 CCMP support
 #device		wlan_amrr		# AMRR transmit rate control algorithm
 
 # PCI
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4b02a23c1c6e..7ce26cb76820 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -888,11 +888,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 and AES-CCMP crypto protocols optionally
 #  used with 802.11 devices that depend on the `wlan' module.
 device		wlan_wep
-device		wlan_ccmp
 device		wlan_tkip
+device		wlan_ccmp
 
 #  The `wlan_xauth' device provides support for external (i.e. user-mode)
 #  authenticators for use with 802.11 drivers that use the `wlan'
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 79a26583b1b1..6fcbaa7d50fe 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -244,8 +244,8 @@ device		wlan			# 802.11 support
 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_tkip		# 802.11 TKIP support
+device		wlan_ccmp		# 802.11 CCMP support
 device		wlan_amrr		# AMRR transmit rate control algorithm
 device		ath			# Atheros CardBus/PCI NICs
 device		ath_hal			# Atheros CardBus/PCI chip support
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 34e6d1bcf027..e807206a4338 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -231,8 +231,8 @@ device		wlan		# 802.11 support
 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_tkip	# 802.11 TKIP support
+device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		ath		# Atheros CardBus/PCI NICs
 device		ath_hal		# Atheros CardBus/PCI chip support
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
index 1d4ac62abd81..5a9e914177e0 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -227,8 +227,8 @@ device		wlan		# 802.11 support
 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_tkip	# 802.11 TKIP support
+device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		ath		# Atheros CardBus/PCI NICs
 device		ath_hal		# Atheros CardBus/PCI chip support