Author: avos
Date: Fri Jan 25 13:48:40 2019
New Revision: 343427
URL: https://svnweb.freebsd.org/changeset/base/343427
Log:
Garbage collect AH_SUPPORT_AR5416 config option.
It does nothing since r318857.
Modified:
head/share/man/man4/ath.4
head/share/man/man4/ath_hal.4
head/sys/amd64/conf/GENERIC
head/sys/conf/NOTES
head/sys/conf/options
head/sys/i386/conf/GENERIC
head/sys/mips/conf/ERL
head/sys/mips/conf/OCTEON1
head/sys/mips/conf/PB92
head/sys/mips/conf/std.AR_MIPS_BASE
head/sys/modules/ath_hal_ar5416/Makefile
head/sys/powerpc/conf/GENERIC
head/sys/powerpc/conf/GENERIC64
head/sys/sparc64/conf/GENERIC
head/tools/tools/ath/ath_ee_9300_print/Makefile
head/tools/tools/ath/athaggrstats/Makefile
head/tools/tools/ath/athdecode/Makefile
head/tools/tools/ath/athkey/Makefile
head/tools/tools/ath/athpoke/Makefile
head/tools/tools/ath/athprom/Makefile
head/tools/tools/ath/athradar/Makefile
head/tools/tools/ath/athratestats/Makefile
head/tools/tools/ath/athregs/Makefile
head/tools/tools/ath/athspectral/Makefile
head/tools/tools/ath/athstats/Makefile
head/tools/tools/ath/athsurvey/Makefile
head/tools/tools/nanobsd/pcengines/ALIX_DSK
Modified: head/share/man/man4/ath.4
==============================================================================
--- head/share/man/man4/ath.4 Fri Jan 25 11:46:07 2019 (r343426)
+++ head/share/man/man4/ath.4 Fri Jan 25 13:48:40 2019 (r343427)
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"/
-.Dd April 14, 2014
+.Dd January 25, 2019
.Dt ATH 4
.Os
.Sh NAME
@@ -42,7 +42,6 @@ kernel configuration file:
.Cd "device ath"
.Cd "device ath_pci"
.Cd "device ath_hal"
-.Cd "options AH_SUPPORT_AR5416"
.Cd "device ath_rate_sample"
.Cd "device wlan"
.Ed
Modified: head/share/man/man4/ath_hal.4
==============================================================================
--- head/share/man/man4/ath_hal.4 Fri Jan 25 11:46:07 2019
(r343426)
+++ head/share/man/man4/ath_hal.4 Fri Jan 25 13:48:40 2019
(r343427)
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"/
-.Dd July 22, 2013
+.Dd January 25, 2019
.Dt ATH_HAL 4
.Os
.Sh NAME
@@ -36,7 +36,6 @@
.Nd "Atheros Hardware Access Layer (HAL)"
.Sh SYNOPSIS
.Cd "device ath_hal"
-.Cd "options AH_SUPPORT_AR5416"
or
.Cd "device ath_ar5210"
.Cd "device ath_ar5211"
@@ -57,12 +56,11 @@ or
.Cd "device ath_ar9285"
.Cd "device ath_ar9287"
.Cd "device ath_ar9300"
-.Cd "options AH_SUPPORT_AR5416"
.Sh DESCRIPTION
The hal provides hardware support for wireless network adapters based on
the Atheros AR5210, AR5211, AR5212, AR5213, AR2413, AR2417, AR2425,
-AR5413, AR5416, AR5418, AR5424, AR9160, AR9220, AR9280, AR9285, AR9287,
-AR9380, AR9390, AR9580, AR9590, AR9562 and QCA9565
+AR5413, AR5416, AR5418, AR5424, AR9130, AR9160, AR9220, AR9280, AR9285,
+AR9287, AR9380, AR9390, AR9580, AR9590, AR9562 and QCA9565
chips (and companion RF/baseband parts).
This code is part of the
.Xr ath 4
@@ -71,11 +69,6 @@ over the set of chips supported.
Selecting
.Nm
enables support for all PCI and Cardbus devices.
-Note this includes AR5416, AR5418, AR9130, AR9160, AR9220, AR9280, AR9285
-and AR9287 devices and must be accompanied by the
-AH_SUPPORT_AR5416
-option to enable the extended hardware descriptor format used by
-AR5416 and later devices.
.Pp
Some devices come in Cardbus/MiniPCI/PCI format.
Others (for example AR2413, AR2427, AR5418, AR9280, AR9285, AR9287) come in
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Fri Jan 25 11:46:07 2019 (r343426)
+++ head/sys/amd64/conf/GENERIC Fri Jan 25 13:48:40 2019 (r343427)
@@ -293,7 +293,6 @@ device an # Aironet
4500/4800 802.11 wireless NICs.
device ath # Atheros NICs
device ath_pci # Atheros pci/cardbus glue
device ath_hal # pci/cardbus chip support
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
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
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Fri Jan 25 11:46:07 2019 (r343426)
+++ head/sys/conf/NOTES Fri Jan 25 13:48:40 2019 (r343427)
@@ -2121,7 +2121,6 @@ device ath_hal # pci/cardbus chip
support
#device ath_rf5112
#device ath_rf5413
#device ath_ar5416 # AR5416 chips
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
# All of the AR5212 parts have a problem when paired with the AR71xx
# CPUS. These parts have a bug that triggers a fatal bus error on the AR71xx
# only. Details of the exact nature of the bug are sketchy, but some can be
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Fri Jan 25 11:46:07 2019 (r343426)
+++ head/sys/conf/options Fri Jan 25 13:48:40 2019 (r343427)
@@ -828,7 +828,6 @@ ATH_DEBUG_ALQ opt_ath.h
ATH_KTR_INTR_DEBUG opt_ath.h
# options for the Atheros hal
-AH_SUPPORT_AR5416 opt_ah.h
# XXX For now, this breaks non-AR9130 chipsets, so only use it
# XXX when actually targeting AR9130.
AH_SUPPORT_AR9130 opt_ah.h
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Fri Jan 25 11:46:07 2019 (r343426)
+++ head/sys/i386/conf/GENERIC Fri Jan 25 13:48:40 2019 (r343427)
@@ -289,7 +289,6 @@ device an # Aironet
4500/4800 802.11 wireless NICs.
device ath # Atheros NICs
device ath_pci # Atheros pci/cardbus glue
device ath_hal # pci/cardbus chip support
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
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
Modified: head/sys/mips/conf/ERL
==============================================================================
--- head/sys/mips/conf/ERL Fri Jan 25 11:46:07 2019 (r343426)
+++ head/sys/mips/conf/ERL Fri Jan 25 13:48:40 2019 (r343427)
@@ -144,7 +144,6 @@ device wlan_amrr # AMRR transmit rate
control algorit
#device ath # Atheros NIC's
#device ath_pci # Atheros pci/cardbus glue
#device ath_hal # pci/cardbus chip support
-#options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
#device ath_rate_sample # SampleRate tx rate control for ath
# Pseudo devices.
Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1 Fri Jan 25 11:46:07 2019 (r343426)
+++ head/sys/mips/conf/OCTEON1 Fri Jan 25 13:48:40 2019 (r343427)
@@ -177,7 +177,6 @@ device wlan_amrr # AMRR transmit rate
control algorit
device ath # Atheros NIC's
device ath_pci # Atheros pci/cardbus glue
device ath_hal # pci/cardbus chip support
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
device ath_rate_sample # SampleRate tx rate control for ath
device ral # Ralink Technology RT2500 wireless NICs.
Modified: head/sys/mips/conf/PB92
==============================================================================
--- head/sys/mips/conf/PB92 Fri Jan 25 11:46:07 2019 (r343426)
+++ head/sys/mips/conf/PB92 Fri Jan 25 13:48:40 2019 (r343427)
@@ -84,7 +84,6 @@ options ATH_ENABLE_11N
options ATH_DIAGAPI
# device ath_hal
-options AH_SUPPORT_AR5416
options AH_DEBUG
options AH_DEBUG_ALQ
Modified: head/sys/mips/conf/std.AR_MIPS_BASE
==============================================================================
--- head/sys/mips/conf/std.AR_MIPS_BASE Fri Jan 25 11:46:07 2019
(r343426)
+++ head/sys/mips/conf/std.AR_MIPS_BASE Fri Jan 25 13:48:40 2019
(r343427)
@@ -55,7 +55,6 @@ options ATH_ENABLE_DFS
options AH_DEBUG_ALQ
options AH_DEBUG
-options AH_SUPPORT_AR5416
options AH_AR5416_INTERRUPT_MITIGATION
options AH_RXCFG_SDMAMW_4BYTES
Modified: head/sys/modules/ath_hal_ar5416/Makefile
==============================================================================
--- head/sys/modules/ath_hal_ar5416/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/sys/modules/ath_hal_ar5416/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -40,9 +40,6 @@ SRCS= ah_osdep_ar5416.c
#
# AR5416, AR9130, AR9160, AR9220, AR9280, AR9285, AR9287 support.
-
-# Note enabling this support requires defining AH_SUPPORT_AR5416
-# in opt_ah.h so the 11n tx/rx descriptor format is handled.
#
# NB: 9160 depends on 5416 but 5416 does not require 9160
#
Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC Fri Jan 25 11:46:07 2019
(r343426)
+++ head/sys/powerpc/conf/GENERIC Fri Jan 25 13:48:40 2019
(r343427)
@@ -200,7 +200,6 @@ device kue # Kawasaki LSI USB
Ethernet
# Wireless NIC cards
options IEEE80211_SUPPORT_MESH
-options AH_SUPPORT_AR5416
# Misc
device iicbus # I2C bus code
Modified: head/sys/powerpc/conf/GENERIC64
==============================================================================
--- head/sys/powerpc/conf/GENERIC64 Fri Jan 25 11:46:07 2019
(r343426)
+++ head/sys/powerpc/conf/GENERIC64 Fri Jan 25 13:48:40 2019
(r343427)
@@ -214,7 +214,6 @@ device kue # Kawasaki LSI USB
Ethernet
# Wireless NIC cards
options IEEE80211_SUPPORT_MESH
-options AH_SUPPORT_AR5416
# FireWire support
device firewire # FireWire bus code
Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC Fri Jan 25 11:46:07 2019
(r343426)
+++ head/sys/sparc64/conf/GENERIC Fri Jan 25 13:48:40 2019
(r343427)
@@ -225,7 +225,6 @@ device wlan_amrr # AMRR transmit rate
control algorit
device ath # Atheros NICs
device ath_pci # Atheros pci/cardbus glue
device ath_hal # Atheros HAL (Hardware Access Layer)
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
device ath_rate_sample # SampleRate tx rate control for ath
# Pseudo devices.
Modified: head/tools/tools/ath/ath_ee_9300_print/Makefile
==============================================================================
--- head/tools/tools/ath/ath_ee_9300_print/Makefile Fri Jan 25 11:46:07
2019 (r343426)
+++ head/tools/tools/ath/ath_ee_9300_print/Makefile Fri Jan 25 13:48:40
2019 (r343427)
@@ -11,7 +11,6 @@ CLEANFILES+= opt_ah.h
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
.include <../Makefile.inc>
Modified: head/tools/tools/ath/athaggrstats/Makefile
==============================================================================
--- head/tools/tools/ath/athaggrstats/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athaggrstats/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -18,7 +18,6 @@ LIBADD+= bsdstat
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
ah_osdep.h:
echo 'typedef void *HAL_SOFTC;' >ah_osdep.h
Modified: head/tools/tools/ath/athdecode/Makefile
==============================================================================
--- head/tools/tools/ath/athdecode/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athdecode/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -17,7 +17,6 @@ CLEANFILES+= opt_ah.h
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
.include <../Makefile.inc>
Modified: head/tools/tools/ath/athkey/Makefile
==============================================================================
--- head/tools/tools/ath/athkey/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athkey/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -10,7 +10,6 @@ CLEANFILES+= opt_ah.h
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
.include <../Makefile.inc>
Modified: head/tools/tools/ath/athpoke/Makefile
==============================================================================
--- head/tools/tools/ath/athpoke/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athpoke/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -17,7 +17,6 @@ CLEANFILES+= opt_ah.h
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
.include <../Makefile.inc>
Modified: head/tools/tools/ath/athprom/Makefile
==============================================================================
--- head/tools/tools/ath/athprom/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athprom/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -14,7 +14,6 @@ CLEANFILES+= opt_ah.h
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
CFLAGS+=-DDIR_TEMPLATE='"${TEMPLATEDIR}"'
Modified: head/tools/tools/ath/athradar/Makefile
==============================================================================
--- head/tools/tools/ath/athradar/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athradar/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -11,6 +11,5 @@ CLEANFILES+= opt_ah.h
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
.include <bsd.prog.mk>
Modified: head/tools/tools/ath/athratestats/Makefile
==============================================================================
--- head/tools/tools/ath/athratestats/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athratestats/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -19,7 +19,6 @@ CFLAGS+=-DATH_SUPPORT_TDMA
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
ah_osdep.h:
echo 'typedef void *HAL_SOFTC;' >ah_osdep.h
Modified: head/tools/tools/ath/athregs/Makefile
==============================================================================
--- head/tools/tools/ath/athregs/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athregs/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -19,7 +19,6 @@ CLEANFILES+= opt_ah.h
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
.include <../Makefile.inc>
Modified: head/tools/tools/ath/athspectral/Makefile
==============================================================================
--- head/tools/tools/ath/athspectral/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athspectral/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -11,6 +11,5 @@ CLEANFILES+= opt_ah.h
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
.include <bsd.prog.mk>
Modified: head/tools/tools/ath/athstats/Makefile
==============================================================================
--- head/tools/tools/ath/athstats/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athstats/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -30,7 +30,6 @@ LIBADD= bsdstat
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
ah_osdep.h:
echo 'typedef void *HAL_SOFTC;' >ah_osdep.h
Modified: head/tools/tools/ath/athsurvey/Makefile
==============================================================================
--- head/tools/tools/ath/athsurvey/Makefile Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/ath/athsurvey/Makefile Fri Jan 25 13:48:40 2019
(r343427)
@@ -11,6 +11,5 @@ CLEANFILES+= opt_ah.h
opt_ah.h:
echo "#define AH_DEBUG 1" > opt_ah.h
echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
- echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
.include <bsd.prog.mk>
Modified: head/tools/tools/nanobsd/pcengines/ALIX_DSK
==============================================================================
--- head/tools/tools/nanobsd/pcengines/ALIX_DSK Fri Jan 25 11:46:07 2019
(r343426)
+++ head/tools/tools/nanobsd/pcengines/ALIX_DSK Fri Jan 25 13:48:40 2019
(r343427)
@@ -62,7 +62,6 @@ device wlan_amrr
device an
device ath
device ath_hal
-options AH_SUPPORT_AR5416
device ath_rate_sample
device wi
device loop
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
