From 9fd987781d3d2456b0ddf4bdce669a92895ca573 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 23 Oct 2014 13:33:18 +0000 Subject: ath: process regulatory notifiers with CONFIG_ATH_USER_REGD set Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43034 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/mac80211/patches/402-ath_regd_optional.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch index 786b39ce00..73c8828c36 100644 --- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch +++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch @@ -33,17 +33,18 @@ if (!wiphy->bands[IEEE80211_BAND_5GHZ]) 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; + wiphy->reg_notifier = reg_notifier; ++ +#ifdef CPTCFG_ATH_USER_REGD + return 0; +#endif + - wiphy->reg_notifier = reg_notifier; wiphy->regulatory_flags |= REGULATORY_STRICT_REG | REGULATORY_CUSTOM_REG; + --- a/drivers/net/wireless/ath/Kconfig +++ b/drivers/net/wireless/ath/Kconfig @@ -21,6 +21,9 @@ menuconfig ATH_CARDS -- cgit v1.2.3