The branch stable/14 has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=faf66c373ab7aef4bd2c9c90c0298a31c74da677
commit faf66c373ab7aef4bd2c9c90c0298a31c74da677
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2024-02-18 18:16:24 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2024-04-01 23:46:10 +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
Reviewed by: adrian, imp
(cherry picked from commit 89c1e54a71cc4e04d4c575ee6df956a12e163cde)
---
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 a88f5713de72..ab1c3856051b 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -291,7 +291,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 c4da2e595ea3..afeb4bd83c06 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -814,7 +814,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 c8e9cd439d74..1a57015d0dcc 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -250,7 +250,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 c413e37b44fb..1e91a4cc9455 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -234,7 +234,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 83cf664bd5d7..d05308b9f0b9 100644
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -230,7 +230,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
