aboutsummaryrefslogtreecommitdiffstats
path: root/package
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
commit9fd987781d3d2456b0ddf4bdce669a92895ca573 (patch)
treea2636783fcf6d98decbe559993ce6ed4deb3bab3 /package
parentc405ee2be7f3bfe661cd3964758ef51a5cfe1b71 (diff)
downloadmaster-187ad058-9fd987781d3d2456b0ddf4bdce669a92895ca573.tar.gz
master-187ad058-9fd987781d3d2456b0ddf4bdce669a92895ca573.tar.bz2
master-187ad058-9fd987781d3d2456b0ddf4bdce669a92895ca573.zip
ath: process regulatory notifiers with CONFIG_ATH_USER_REGD set
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43034 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-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