diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 57fa3067c2ea..1053166125b7 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -284,7 +284,6 @@ device		xl			# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 # Wireless NIC cards
 device		wlan			# 802.11 support
 options 	IEEE80211_DEBUG		# enable debug msgs
-options 	IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
 device		wlan_wep		# 802.11 WEP support
 device		wlan_ccmp		# 802.11 CCMP support
diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188
index 8ffe581ee1d0..440041a023ca 100644
--- a/sys/arm/conf/RK3188
+++ b/sys/arm/conf/RK3188
@@ -79,7 +79,6 @@ device		bpf
 
 # Wireless NIC cards
 options 	IEEE80211_DEBUG
-options 	IEEE80211_AMPDU_AGE
 options 	IEEE80211_SUPPORT_MESH
 options 	IEEE80211_SUPPORT_TDMA
 device		wlan			# 802.11 support
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 1b019dbe09ff..e764c16fced0 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -843,7 +843,6 @@ device		vxlan
 #  and ath drivers and will eventually be required by all 802.11 drivers.
 device		wlan
 options 	IEEE80211_DEBUG		#enable debugging msgs
-options 	IEEE80211_AMPDU_AGE	#age frames in AMPDU reorder q's
 options 	IEEE80211_SUPPORT_MESH	#enable 802.11s D3.0 support
 options 	IEEE80211_SUPPORT_TDMA	#enable TDMA support
 
diff --git a/sys/conf/config.mk b/sys/conf/config.mk
index 63c82fb36819..1e40dc3f5923 100644
--- a/sys/conf/config.mk
+++ b/sys/conf/config.mk
@@ -31,13 +31,12 @@ opt_scsi.h:
 	echo "#define SCSI_DELAY 15000" > ${.TARGET}
 opt_wlan.h:
 	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-	echo "#define IEEE80211_AMPDU_AGE 1" >> ${.TARGET}
 	echo "#define IEEE80211_SUPPORT_MESH 1" >> ${.TARGET}
 KERN_OPTS.i386=NEW_PCIB DEV_PCI
 KERN_OPTS.amd64=NEW_PCIB DEV_PCI
 KERN_OPTS.powerpc=NEW_PCIB DEV_PCI
 KERN_OPTS=MROUTING IEEE80211_DEBUG \
-	IEEE80211_AMPDU_AGE IEEE80211_SUPPORT_MESH DEV_BPF \
+	IEEE80211_SUPPORT_MESH DEV_BPF \
 	${KERN_OPTS.${MACHINE}} ${KERN_OPTS_EXTRA}
 .if ${MK_INET_SUPPORT} != "no"
 KERN_OPTS+= INET TCP_OFFLOAD
diff --git a/sys/conf/options b/sys/conf/options
index 4724a1a601c1..6d902001b543 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -908,7 +908,6 @@ HWPMC_MIPS_BACKTRACE 	opt_hwpmc_hooks.h
 # 802.11 support layer
 IEEE80211_DEBUG		opt_wlan.h
 IEEE80211_DEBUG_REFCNT	opt_wlan.h
-IEEE80211_AMPDU_AGE	opt_wlan.h
 IEEE80211_SUPPORT_MESH	opt_wlan.h
 IEEE80211_SUPPORT_SUPERG	opt_wlan.h
 IEEE80211_SUPPORT_TDMA	opt_wlan.h
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 46e6a599fb40..fbcc61647ad7 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -280,7 +280,6 @@ device		xe			# Xircom pccard Ethernet
 # Wireless NIC cards
 device		wlan			# 802.11 support
 options 	IEEE80211_DEBUG		# enable debug msgs
-options 	IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
 device		wlan_wep		# 802.11 WEP support
 device		wlan_ccmp		# 802.11 CCMP support
diff --git a/sys/mips/conf/ERL b/sys/mips/conf/ERL
index 639f34d09b67..d1f23271dbe6 100644
--- a/sys/mips/conf/ERL
+++ b/sys/mips/conf/ERL
@@ -136,7 +136,6 @@ device		octm
 # Wireless NIC cards
 device		wlan		# 802.11 support
 options 	IEEE80211_DEBUG	# enable debug msgs
-options 	IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1
index 068126bf8b80..09d1d395cdd7 100644
--- a/sys/mips/conf/OCTEON1
+++ b/sys/mips/conf/OCTEON1
@@ -169,7 +169,6 @@ device		bge		# Broadcom BCM570xx Gigabit Ethernet
 
 device		wlan		# 802.11 support
 options 	IEEE80211_DEBUG	# enable debug msgs
-options 	IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index c1adc072c5a7..cc905bf2a54a 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -217,7 +217,6 @@ device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 # Wireless NIC cards
 device		wlan		# 802.11 support
 options 	IEEE80211_DEBUG	# enable debug msgs
-options 	IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
 options 	IEEE80211_SUPPORT_MESH	# enable 802.11s D3.0 support
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
diff --git a/tools/tools/nanobsd/pcengines/ALIX_DSK b/tools/tools/nanobsd/pcengines/ALIX_DSK
index b46f3ee37569..7635a8c80b93 100644
--- a/tools/tools/nanobsd/pcengines/ALIX_DSK
+++ b/tools/tools/nanobsd/pcengines/ALIX_DSK
@@ -54,7 +54,6 @@ device		miibus
 device		vr		
 device		wlan		
 options 	IEEE80211_DEBUG	
-options 	IEEE80211_AMPDU_AGE 
 options 	IEEE80211_SUPPORT_MESH	
 device		wlan_wep	
 device		wlan_ccmp