From 4f1bec03fd72ff653c9de64c5b8a1c1065df8d25 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 25 Oct 2014 09:31:04 +0000 Subject: [PATCH] ath9k: fix regulatory notifier calls with CONFIG_ATH_USER_REGD=y (#18211) Signed-off-by: Felix Fietkau SVN-Revision: 43055 --- .../kernel/mac80211/patches/403-ath_regd_optional.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/kernel/mac80211/patches/403-ath_regd_optional.patch b/package/kernel/mac80211/patches/403-ath_regd_optional.patch index 808e729238..3af2e52897 100644 --- a/package/kernel/mac80211/patches/403-ath_regd_optional.patch +++ b/package/kernel/mac80211/patches/403-ath_regd_optional.patch @@ -33,17 +33,18 @@ if (!wiphy->bands[IEEE80211_BAND_5GHZ]) return; -@@ -631,6 +643,10 @@ ath_regd_init_wiphy(struct ath_regulator - { +@@ -632,6 +644,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 -- 2.30.2