From nobody Fri Oct 10 17:16:14 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 4cjtgg0gkXz6Bcjp; Fri, 10 Oct 2025 17:16:15 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjtgg01bNz3gGZ; Fri, 10 Oct 2025 17:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760116575; 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=vna7hESnn3ObsA1KhUs78mQyFB44mJjove5Nf4gr9h8=; b=iqOMZY8vB/JHmcMegFq+989XToSejcwIJfvtd2XK94x7xkc6hSOm0Ee0hCa5/ed9roH0mp lMNjWoRDlYFSqrqul53K0k+WFvdwqiE9hXSO8TjPyr+0FJ4z0t83uhsDDB9Z3/XiCMqUPZ ofuwGI42Yu0tHDo0ntrkGlAode/kQzObEjlzX4PiPH4Ro/fNI8IiNm2c3M9a4jDZHbvlQx UGvWhjmKIHO45iuVgibRSncsHbBNROfNTz0BDYuglcIo8m7Maiztd2C3Au+q67KhwbiRuB QbDm1pJ1gdHobR4Jget0+qfnCzOwszh3UdG1DeaMhEFlj80tRhz/L8TCcnUwnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760116575; 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=vna7hESnn3ObsA1KhUs78mQyFB44mJjove5Nf4gr9h8=; b=xiBlJerA6pgcGmfa34E/uyNRD74gRL+xgfrPykugbin0KESo0tUGVxjhJ/rxyTPQD5LJo5 PTeHUjz59Qubtc7IjDl2VSEgHXzVCoXA+e0f62CpPqsLPwr00nBff1yTJOVkIxg8J7fi5K v865gDtRa4cigOTYNYa7ohLXSS3DyK0QCMdjpWE+8pL/00mTe4lZ7Bu8U/a/OQpMlnFdIX 6OEZhIb3iQ/hoRcQDEJSXEUl+HBzBBbT/uALVOf5SjnPgHvdpOeyZZGLctQ3ZefebPZ2L/ DtAuEvxs2UYkzOL4veE58qLu5y7yAbGe1uafaBUrrKpsCOn53inu/iMoSGkR/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760116575; a=rsa-sha256; cv=none; b=GHaV7zAGpidASLBsLSz0aikhHVnWCUgp18a/4f/K3DyLRRRpIvRl4HaUHyKcr3M7A8xNcg 8FJhnNQMqwkptTeLdIF6Ej9Xh+hR2O+Ik1jjpExv2K3Ky99Ena7FdzzIzS3rELjTvnpI+9 EwgRItqFo3wpQcXV8ATqUmq+eWb0LYn5eRCCz+pDgKkqFV9KgvS/XPW6w7HbpusOStAFiy QaMaBpU9dP2z8qdlfPeS6wlMt+1C/1pzco1SxhbwrU3OEoLq+njJzcZrY7sGdb16fDoHbq CatBX8tbciQIACnshn31wZlJJneBd0rPu/zQmTwtEAGnxVRQo3I2XKUntBqrNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cjtgf6QfFz1BWH; Fri, 10 Oct 2025 17:16:14 +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 59AHGEXW009039; Fri, 10 Oct 2025 17:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59AHGEPm009036; Fri, 10 Oct 2025 17:16:14 GMT (envelope-from git) Date: Fri, 10 Oct 2025 17:16:14 GMT Message-Id: <202510101716.59AHGEPm009036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 47acc6846564 - stable/14 - sys: NOTES, GENERIC*: Re-order 'wlan_tkip' 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 47acc6846564609d4fe01a94357e81044e055842 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=47acc6846564609d4fe01a94357e81044e055842 commit 47acc6846564609d4fe01a94357e81044e055842 Author: Olivier Certner AuthorDate: 2025-09-09 12:03:59 +0000 Commit: Olivier Certner 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