From nobody Thu Feb 22 22:39:31 2024 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 4Tgp3m0wFZz5BZHB; Thu, 22 Feb 2024 22:39:32 +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 4Tgp3l6LZDz4F4G; Thu, 22 Feb 2024 22:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708641571; 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=M78agfIl0bxjeBcuSEjLoJqBDsn+MXjloSOW5ScPQA0=; b=StyzmTrtgueQPmMqwS9Xf5uKyPCmOaLTya2upP1OoJubX+JawhZLfJERhfDRKpZphRl9ll StZMuxbGbOpN5msl7VyJU9y8mPI3d17GSzfm+FTtbD1qBRj5BSxhzkVXSoh1BYhz7exJ+t JR3Q4sBntepS6lS5OMBYHxlM+EDJ953QC4dK5Px/Nzgff9DPgUOELAmk2WitQeKMUIASn2 yALcQaa63Nd7Nn5miNPu4gjb7ktyPBy8cQu2n3H6VFw82puh014vkn2j2K7I5DAsW8Yzuz OGvSf1E7ylopi4bs+ejVzuYEpHeDFk8/aFCqJRVyknlW3iY5hv6B8upcy2eXwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708641571; 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=M78agfIl0bxjeBcuSEjLoJqBDsn+MXjloSOW5ScPQA0=; b=SzemRMQCEJMu06Hq2M6XPU6lL9tHcualCb3grzDpbX4BlZRJYesu75Op9pKMcDFMWYjv/B JNQ2FVI1hJV/HGIQWJSHgLgO6CixkviAw3AF/1B2x5HYwR6NxzcRKPYEGeYj1xJENbCFS0 PeOERxItlpzeozj3pOLTdP67HAhFrA/OecBioZUopENmd4En6IB/G4QmPLVIV+zaHsNzZM 95nRJKIk0Ii4zt/bpOc2dmYplq+2yuLfNJhngirvVzOElpG8gshncjXeTOUqnzvSkSUYEh 8TGnyN4FhA72z1O5a7Q1Z+o4RStPq3eJcAylAjWccoh5qrAm58Yb8w+Hip83Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708641571; a=rsa-sha256; cv=none; b=V0uhTqe0PGBZTVkK9N+8OpdV36Rg7oCJGhEUUMsrAWZ0TcLcykEeJVcjgqGTZ0ZuP5u7+h jo5PcszJxrmF65yvdODsGNyDsw3/MQstPrIrEARZ5f9LWHTGCxVR37BjJnL5b6ISHdcXUV NjuvV29HMIZPYXzHk993FIfEtIyXrT0ZZGuuhVrRhNZ/DQMjHdJIzmguu1JBlOpD+Tg9wJ NYyvgDygYwPxu5S8B12EIn7sxzuKJlyYG74BwCFr6PrkIr/LecED0msh6LnlM/tyR5DCMr 7knIECWuSpjnl/L+KxhRbQF39cTuGVhRUmo3+5GibFSArVrB69qhShzI6wmFBg== 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 4Tgp3l5PTQzqf9; Thu, 22 Feb 2024 22:39:31 +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 41MMdVrQ043471; Thu, 22 Feb 2024 22:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MMdVHX043468; Thu, 22 Feb 2024 22:39:31 GMT (envelope-from git) Date: Thu, 22 Feb 2024 22:39:31 GMT Message-Id: <202402222239.41MMdVHX043468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 89c1e54a71cc - main - ath(4): always enable 11n 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/main X-Git-Reftype: branch X-Git-Commit: 89c1e54a71cc4e04d4c575ee6df956a12e163cde Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=89c1e54a71cc4e04d4c575ee6df956a12e163cde commit 89c1e54a71cc4e04d4c575ee6df956a12e163cde Author: Bjoern A. Zeeb AuthorDate: 2024-02-18 18:16:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-22 22:34:17 +0000 ath(4): always enable 11n Enabling 11n for ath(4) so far was handled by a kernel option, which was only enabled for certain kernel configurations. In order to allow loading ath(4) as a module with 11n support on all platforms, remove the kernel option and unconditionally enable 11n in ath(4). Reported by: pkubaj Discussed with: adrian in D43549. Reviewed by: adrian, imp Differential Revision: https://reviews.freebsd.org/D43964 --- sys/amd64/conf/GENERIC | 1 - sys/arm/conf/ARMADA38X | 1 - sys/conf/options | 1 - sys/dev/ath/if_athvar.h | 1 + sys/i386/conf/GENERIC | 1 - sys/powerpc/conf/GENERIC64 | 1 - sys/powerpc/conf/GENERIC64LE | 1 - 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 1c1fde99ba8e..cfdfb2c89d4a 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -305,7 +305,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #device bwi # Broadcom BCM430x/BCM431x wireless NICs. #device bwn # Broadcom BCM43xx wireless NICs. diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X index d0c7ddcef60b..bb7ef098f350 100644 --- a/sys/arm/conf/ARMADA38X +++ b/sys/arm/conf/ARMADA38X @@ -90,7 +90,6 @@ device wlan # 802.11 support device ath # Atheros CardBus/PCI NICs device ath_hal device ath_rate_sample -options ATH_ENABLE_11N # CESA device cesa diff --git a/sys/conf/options b/sys/conf/options index f20e43aad962..555484360a2b 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -816,7 +816,6 @@ ATH_TXBUF opt_ath.h ATH_RXBUF opt_ath.h ATH_DIAGAPI opt_ath.h ATH_TX99_DIAG opt_ath.h -ATH_ENABLE_11N opt_ath.h ATH_ENABLE_DFS opt_ath.h ATH_EEPROM_FIRMWARE opt_ath.h ATH_ENABLE_RADIOTAP_VENDOR_EXT opt_ath.h diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index f706b360946a..96c4318d5987 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -59,6 +59,7 @@ /* * 802.11n requires more TX and RX buffers to do AMPDU. */ +#define ATH_ENABLE_11N /* 802.11n support for AR5416 and later */ #ifdef ATH_ENABLE_11N #define ATH_TXBUF 512 #define ATH_RXBUF 512 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 948c44114d7d..461a21fe7b70 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -261,7 +261,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #device bwi # Broadcom BCM430x/BCM431x wireless NICs. #device bwn # Broadcom BCM43xx wireless NICs. diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index ac041c420ee0..9d2de9c8095b 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -244,7 +244,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath # FireWire support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index d90018802d37..6ca1a01e5969 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -240,7 +240,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath # FireWire support