aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-23 13:33:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-23 13:33:18 +0000
commit16a9ab1d58f6c8d75a0c1444dc67a244806f93e1 (patch)
tree2117d52d760cad45c3f583a9273fd562037cc942
parent3772f272d0910ac95bfb19e313cfc30e06601ead (diff)
downloadupstream-16a9ab1d58f6c8d75a0c1444dc67a244806f93e1.tar.gz
upstream-16a9ab1d58f6c8d75a0c1444dc67a244806f93e1.tar.bz2
upstream-16a9ab1d58f6c8d75a0c1444dc67a244806f93e1.zip
ath: process regulatory notifiers with CONFIG_ATH_USER_REGD set
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43034
-rw-r--r--package/kernel/mac80211/patches/402-ath_regd_optional.patch7
1 files 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