gentoo auto-resync : 21:01:2024 - 14:09:19

10 files changed, 32 insertions, 72 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 56131814fbcb..e75c38aef7cf 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index d8a6b430c691..bf0bc3c536e6 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -7,7 +7,7 @@ DIST iwd-2.3.tar.xz 1061732 BLAKE2B d22bb6bd2a1672536872f5642ed31361681fb16e08f3
 DIST iwd-2.8.tar.xz 1067700 BLAKE2B ac691dfff675bd331a7af9e02179a5df61f0e20299c4a2851bd31950cbd0b696369069bd4a635cb25d24aec75996190bf8e47c2626eeff43b7ab37af5f932989 SHA512 bd208dc5ff391dccfe1b4a12f4b587ca8cedc1c1a7a2ddb34999c23acfad0e590e0463ac1ddc5093cb6489eb8ab8a090c01bcf06d679cfaf59c4b81469631795
 EBUILD iwd-2.12.ebuild 4139 BLAKE2B 20dea8d2d5fff1a24674b8bd5fbea4cd58794f6a123aac6b31e8445e361713ed64b0de1eef8530cb22a2c1d8a5e3fa15d66144fbd629f47adbd8e0749ce8d489 SHA512 ce4683a480aad029b14bf0e8c277f3674d1f7b3728ef78628e9631b6094e43221df19c9d21042757a8211ba48f79266ab78ff80eb80c955acb693c53da6ee1f1
 EBUILD iwd-2.13.ebuild 4139 BLAKE2B 3afc75a203d91c998117e27f3cbafdb051d4db77d03ebc8875f1cc59f46c2752fee79316d6eca1a37de3e4a30ae74fde5d938c2dcce6fa9a5e7ec69cef423bb7 SHA512 dad8f3e6c5c427b1f62b3a50471a7a9f92818e7bd4e8f6df796e47b661c60e3e0ef461f5cdb919d8a8e29761344542e515f17198e2d8a531e69b64300cc576a7
-EBUILD iwd-2.3.ebuild 5019 BLAKE2B 3e70ba2fb44150598bfc1b8e6ff2e104c894c42d15e73a33061f26bd0a8df42915d1a09d9727b02c294c4db65307578466faeda063d6e6a05689e24228af4edc SHA512 be93e840a764e675894521447c5ea2b2e31365b160a7ae4f3b4514e9fd7585386d4fb29c83715af910f189f60559e768c87d822d50de643b8bb8f5a8dcb0c71c
+EBUILD iwd-2.3.ebuild 4806 BLAKE2B a55c6a342bee4294507cb4d8e2b90e36883abfcef3b76bb472c67b33481a78fb227cb451fd74fbb77bb5bbcb54530145ded874cb1f47d8da7366d8a696673657 SHA512 b316d852b47aa8cd1e6db8458eb2233d438b5344e31487bc764509f284330a014a23b2852be2f7a1b5231106ff43caabca4ee10322b5f9142d63965c131e6bbd
 EBUILD iwd-2.8-r2.ebuild 4133 BLAKE2B 7b9b7ba722760e7af20875377da15c7aa77d8fac7357fd814a70cc599fb2f63e6a383d6abfa82dec599f744eb8ee2ac277fe3317df35fc7918d702263d5cab53 SHA512 f49d215b1acdd0a76e09f93b84fa3ac33c5e11e74d7b61dfc334ca7cdd1bb431eedcae9711b6a7551ecfe7b5d01f71a6abdcb087235df6d231195a68fe538eda
 EBUILD iwd-9999.ebuild 4134 BLAKE2B fc962b5d779c059553cdb33cda2ca2824c7dcea091de99b884d2d6bc7e89cc2b2b43bc5cd4064b50386b7be21b1516cf9435c47276cde6f2ec2dcde284f18b65 SHA512 7e9ed114434f2d26b7b85a03f458ee30fcdcc12622da4501d00e685e712b4bb706939b2e0ffba358375b6025816a9b9ca9bd19d8ea7aac228662dad3dfc48baa
-MISC metadata.xml 844 BLAKE2B a0745226f5314cee29c405d53b5f03c1e2706518272a69443174123601c4b79ad5902e2f22575b46bed37c5d6ebebd1ad4cdcccbb7c40405c4d04f2b92bef17d SHA512 9997101871ad37981492b0a70150d091926ec2321f13d70d5f85f2ff5d360cc87970beb9575c2f78a909e6f3a91ef022fd7115db9ec0ec77d5d94363ed30d793
+MISC metadata.xml 717 BLAKE2B 4619afbff3a4275ff2307476c044c1a4f7c2a14ec4fbeec0db02cd35d8ec98a5d3febcde34dbc43a358129d02369ee6178e02d3938b7cace99946a963d235d99 SHA512 46809c9157af3809f720d38e71e900bb4ee8418f79030cda45e7c4547dca9f2f3b5932c5b481c44ae6bbfd0b48c0997106ada3be30ef5f2110cc287738f24473
diff --git a/net-wireless/iwd/iwd-2.3.ebuild b/net-wireless/iwd/iwd-2.3.ebuild
index 9f77d24c371e..6448e6e3e291 100644
--- a/net-wireless/iwd/iwd-2.3.ebuild
+++ b/net-wireless/iwd/iwd-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 crda +monitor ofono selinux standalone systemd wired"
+IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired"
 
 DEPEND="
 	sys-apps/dbus
@@ -35,7 +35,6 @@ RDEPEND="
 	${DEPEND}
 	acct-group/netdev
 	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )
 	selinux? ( sec-policy/selinux-networkmanager )
 	standalone? (
 		systemd? ( sys-apps/systemd )
@@ -73,11 +72,6 @@ pkg_setup() {
 		~RFKILL
 		~X509_CERTIFICATE_PARSER
 	"
-	if use crda;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
-		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper
-	regulatory domain support"
-	fi
 
 	if use amd64;then
 		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
@@ -102,21 +96,20 @@ pkg_setup() {
 
 	check_extra_config
 
-	if ! use crda; then
-		if use kernel_linux && kernel_is -lt 4 15; then
-			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
-			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
-		fi
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
+	if use kernel_linux && kernel_is -lt 4 15; then
+		ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
+		ewarn "Regulatory domain support for kernels older than 4.15 requires crda, which has been removed."
+		ewarn "Please update to a more recent kernel."
+	fi
+	if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+		[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+	then
+		ewarn ""
+		ewarn "REGULATORY DOMAIN PROBLEM:"
+		ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+		ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+		ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+		ewarn ""
 	fi
 }
 
diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml
index e63160880b73..af405c7bf0b6 100644
--- a/net-wireless/iwd/metadata.xml
+++ b/net-wireless/iwd/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="client">Enable iwctl client tool</flag>
-		<flag name="crda">Use <pkg>net-wireless/crda</pkg> for regulatory domain loading instead of in-kernel (4.15+) support</flag>
 		<flag name="monitor">Enable iwmon monitor tool</flag>
 		<flag name="ofono">Enable support for oFono SIM authentication</flag>
 		<flag name="standalone">Enable standalone mode with built-in DHCP client and DNS handling"</flag>
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 2c6e3f3f007c..1c3cfe918a96 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,5 +1,5 @@
 DIST wireless-regdb-2022.06.06.tar.xz 26636 BLAKE2B e7695b1d4173ec239645a1f9c0bdd8f9cef92da86d918f3b2a7904487787b1a8b6fce5a75d0b7fad7d8a25f1419a4771e509977a5e3b13dff03bc53e976609f6 SHA512 ee6e79eeef3bf995120d31741bac9592771cbf918401f83d0ee059ba4119f7d9667607c5218bd9eeb0011dd7083264cf39a1a0ad3ebfd37dcfd957b01f248e0d
 DIST wireless-regdb-2023.05.03.tar.xz 27260 BLAKE2B e880be3bacd7409719ede3e104ea6af870e0fb4edaefa6c61615ca74a8169a159348d631a4c296e273f6cc6e01ced2089e56c10080dd15a7439d8b4510eff7b8 SHA512 9de4852a1d351c11399ca55ea2ad61be23f488c61595b5c5afa3498d76488adc8120c6c77644275c460efcd1bb5bb68fa25597e73bec22ae847321bb55f7af27
 EBUILD wireless-regdb-20220606.ebuild 1099 BLAKE2B 2a337f4aed15757ea01d52e31a1989f25ed11a3a1437c117a2dca17c9551c76459e027c295978aa0146be44e5c8d045212c4aa96dd0c9e7b4a72db2458a90861 SHA512 42ad07e183e9e039f5e1ca503fb8a4ef6e25d4ed5c9ba38effa7abff0dbfc9338417d5e1aca314e093752e5c41b7830ff0a1c3ac864db170895e143ef12bb2db
-EBUILD wireless-regdb-20230503-r2.ebuild 2869 BLAKE2B 0fc9439f2b5df536c7723bf66e4461602c9c1e34f9f7d4128ba67ee6c75e9770ef0ed41143e047919a56ae0a921800e66da66c829df3bec9cdee872dc407245d SHA512 d358056a8eae01c465d977032ecc810a3474ffe98e539672c04ce56614cba27b93b421384b83a16f020e4c341e13d660829ecc296207a2783c3a322b2e3e3ae6
-MISC metadata.xml 423 BLAKE2B 5efca466ca95efca980dede4352cd67f120440ccac911e1dbd16bc7931ed193a3c08b1794acb77389caea2494f6e6ede0052313fd9ca0ac5ad18b87d0491fdd3 SHA512 97a332381f091c8365992a226eeb4b22c764b6d44fa9ece8ea6fddf299f1e91901690743211a13023652f1cc8d6b5d771f8c2425638fe43891425b5a0753a406
+EBUILD wireless-regdb-20230503-r2.ebuild 2262 BLAKE2B f98b255eb344a2eceb630197f2d0ff2cb5283641ce5d69bbc16c04eb80965fd0edae9e88c0cec680e404b4d1bbc3ba824b90f2939644b684baa9e040115db681 SHA512 050f0509cf116119e00f2ba897ec1acb55e2ee9087291ab5dd4076e9424b7febe55581016a69bba109f2e9870c1d85b4cefaea405cf8b1cc0445052eddafd44c
+MISC metadata.xml 272 BLAKE2B 2a42142ca287ab19668cc11278dac4d0f16bf5b183646b0f06317a6e60568d9328d42baa986af6c692a256b28fdef32f24442faf69ae9b8305d625a3265df298 SHA512 4595277c33cd3d565c652cae1644c4ba131dea25899984629a48dc9a679441c95a7d26527c6fe4578a3e6f616e6f8c25580ee9f785fdcbd699bd43bacd846dd3
diff --git a/net-wireless/wireless-regdb/metadata.xml b/net-wireless/wireless-regdb/metadata.xml
index 101c017e6f75..a61f7bfb3196 100644
--- a/net-wireless/wireless-regdb/metadata.xml
+++ b/net-wireless/wireless-regdb/metadata.xml
@@ -6,7 +6,4 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<stabilize-allarches/>
-	<use>
-		<flag name="crda">Use obsolete <pkg>net-wireless/crda</pkg> for regulatory domain loading instead of in-kernel (4.15+) support</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild
index 4bf9984598e8..8860373ea93f 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,11 +14,6 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="crda"
-
-#PDEPEND is required here or crda test dep causes circular deps
-PDEPEND="crda? ( net-wireless/crda )"
-
 REQUIRED_USE="kernel_linux"
 
 pkg_pretend() {
@@ -40,12 +35,6 @@ pkg_pretend() {
 				ewarn "You can safely disable CFG80211_CRDA_SUPPORT"
 			fi
 		fi
-
-		if has_version net-wireless/crda || use crda; then
-			ewarn "Starting from kernel version 4.15 net-wireless/crda is no longer needed."
-			ewarn "The crda USE flag will be removed on or after Feb 01, 2024"
-		fi
-
 	else
 		CONFIG_CHECK="~CFG80211_CRDA_SUPPORT"
 		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: \
@@ -61,15 +50,6 @@ src_compile() {
 }
 
 src_install() {
-	if use crda; then
-		# This file is not ABI-specific, and crda itself always hardcodes
-		# this path.  So install into a common location for all ABIs to use.
-		insinto /usr/lib/crda
-		doins regulatory.bin
-
-		insinto /etc/wireless-regdb/pubkeys
-		doins sforshee.key.pub.pem
-	fi
 	# install the files the kernel needs unconditionally,
 	# they are small and kernels get upgraded
 	insinto /lib/firmware
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 440dbf67c15e..a3bd5b158189 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -6,8 +6,8 @@ AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f64
 AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e140f56fc1d3e6b16454351a270e566dd7fc4717b92251193bdf59a77f57fc3fdd1d53b067f2e5253796c041b SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403
 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8
 DIST wpa_supplicant-2.10.tar.gz 3511622 BLAKE2B 7f6045e5dcf24f7ccf1ea75c99541f9d68fadaea858a6ca11a95c997de14e33b3aa89138e748664579b5a4ea493d247cf6613da3c5fae49a4dbb5cd58dace752 SHA512 021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1
-EBUILD wpa_supplicant-2.10-r1.ebuild 13515 BLAKE2B 71a0a18099f6e233e0a73d50266b36839ab4608782712e31aeb326961b01e29f3f5ffddd699ce1cc205ca5bfddf5456f1ce2376fb1c4dc9fc5054607ab9f04bf SHA512 d669c9b3cfa9b2914e54ac70ad068a3959c282b5d64372d72036f2d88afaee4580ed9905bdd89202e072e86e1f7cce1382435496c7b7d1b44c5b5de222169a93
+EBUILD wpa_supplicant-2.10-r1.ebuild 13230 BLAKE2B ea6864ee83308c22ea05b658c28829a3f05aae0a6dcc1a4dee694f81a3a1bfa3b393ffe8aa9077d31915054ba78b0045ba6cc55481ba0f3e6f5fe9901b44e263 SHA512 93092a77aed42c800eb0f0daa178a87149d32904fa60be8103d6a27cbf6a057db9cefd7cf5860dd7a3fb45c082fb3dd0455b4d477c09169195c17231908eee93
 EBUILD wpa_supplicant-2.10-r2.ebuild 12514 BLAKE2B 43059454cffd29b4ffde61630b5bfd3c93d7c8f83035f9a0e53af65d9082cbb9eb2122884de1f61933ca11c28600639b0c5e2820db60ddd54c1d00fe21dfe67e SHA512 458c449bf9259bbfd0e68070595e817a9b8261680d46c9216f5ab8c7ea19bc1f6834b084e29c6c4de589ea38dc7521aaee45d50404d2350129fb42a82c407de7
 EBUILD wpa_supplicant-2.10-r3.ebuild 12669 BLAKE2B 9323577216ae28c446db9f7fde3dc936df4ecdf0e11b9836564a8500c2285df0efb874bd80b7e1b0d56aa4704f5afc73b631bb7fdc144f3db191294f0d655ba2 SHA512 ef7e9e09e27a1a6fac754eeb48e964f7870d315ac6608c4cdece68f4880464844e92b0bbb53e76ac9944a43f9bd0901e977ff0dbe65a933541080c26fcd828c5
 EBUILD wpa_supplicant-9999.ebuild 12597 BLAKE2B 83a4c416930a1a302a4bff751135a762eba1c022d9124cb844ab622a8fb79e2864ab6c221aa3a601eb05aeb158d3a4ddbdd7954300061bc812b027c2e4cd44b1 SHA512 d234545752a2179843632fda855b8f55eb2a999ec4c707adb0f01c739e6bf553f86afe37e99a9169ec7371187739edfa518328571a36216fc0bb7cedaba6560e
-MISC metadata.xml 2009 BLAKE2B 1325c2f5c246bd9c4760b31d5a3cd65519aada177f10fb8df4cbb591dce85e69dcf2033cad88be8e96205721d6c0523e061af0dc281afcea3b625815fb1716fe SHA512 91a69ae5aeebcc5dc5f3f121d007ba6efc61d8025023e0dcad030918af83294622ae72e93db70c835da8ae2ab77de3aab29c7e4ad890471243992b1db490376c
+MISC metadata.xml 1882 BLAKE2B fc23e2184bd2c01f590800a2087461ba6c5d9d5021f6300f1505671369694374a26d333556b467ca0f41fb90d676a5fcad5b87e80ab8f2b2b891255afa0bcd6b SHA512 05ca61dcaf7c3d7543085be7d375088e5372eb6e3dee0cd9920b763e34f528aa988a8ec484328e122812e0f3208aac308d6011995e5ab1c9599fc7d5b9dc6733
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index ecb638b513dc..489b2ea119fd 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="ap">Add support for access point mode</flag>
 		<flag name="broadcom-sta">Flag to help users disable features not supported by broadcom-sta driver</flag>
-		<flag name="crda">Use <pkg>net-wireless/crda</pkg> for regulatory domain loading instead of in-kernel (4.15+) support</flag>
 		<flag name="eap-sim">Add support for EAP-SIM authentication algorithm</flag>
 		<flag name="eapol-test">Build and install eapol_test binary</flag>
 		<flag name="fasteap">Add support for FAST-EAP authentication algorithm</flag>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
index dbd441303c31..867bb37f63ac 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps"
+IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip uncommon-eap-types wep wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -52,7 +52,6 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-networkmanager )
 	kernel_linux? (
 		net-wireless/wireless-regdb
-		crda? ( net-wireless/crda )
 	)
 "
 BDEPEND="virtual/pkgconfig"
@@ -90,22 +89,15 @@ Kconfig_style_config() {
 pkg_pretend() {
 	CONFIG_CHECK=""
 
-	if use crda ; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
-		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
-	fi
-
 	check_extra_config
 
-	if ! use crda ; then
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-		fi
+	if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+		[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+	then
+		ewarn "REGULATORY DOMAIN PROBLEM:"
+		ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+		ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+		ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
 	fi
 }