ath: process regulatory notifiers with CONFIG_ATH_USER_REGD set

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43034
This commit is contained in:
Felix Fietkau 2014-10-23 13:33:18 +00:00
parent 3772f272d0
commit 16a9ab1d58

View file

@ -33,17 +33,18 @@
if (!wiphy->bands[IEEE80211_BAND_5GHZ]) if (!wiphy->bands[IEEE80211_BAND_5GHZ])
return; return;
@@ -632,6 +644,10 @@ ath_regd_init_wiphy(struct ath_regulator @@ -633,6 +645,11 @@ ath_regd_init_wiphy(struct ath_regulator
{
const struct ieee80211_regdomain *regd; const struct ieee80211_regdomain *regd;
wiphy->reg_notifier = reg_notifier;
+
+#ifdef CPTCFG_ATH_USER_REGD +#ifdef CPTCFG_ATH_USER_REGD
+ return 0; + return 0;
+#endif +#endif
+ +
wiphy->reg_notifier = reg_notifier;
wiphy->regulatory_flags |= REGULATORY_STRICT_REG | wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
REGULATORY_CUSTOM_REG; REGULATORY_CUSTOM_REG;
--- a/drivers/net/wireless/ath/Kconfig --- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig +++ b/drivers/net/wireless/ath/Kconfig
@@ -21,6 +21,9 @@ menuconfig ATH_CARDS @@ -21,6 +21,9 @@ menuconfig ATH_CARDS