ath9k: fix regulatory notifier calls with CONFIG_ATH_USER_REGD=y (#18211)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@43055 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
fdbd75e036
commit
e3da990876
|
@ -33,17 +33,18 @@
|
||||||
if (!wiphy->bands[IEEE80211_BAND_5GHZ])
|
if (!wiphy->bands[IEEE80211_BAND_5GHZ])
|
||||||
return;
|
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;
|
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
|
||||||
|
|
Loading…
Reference in New Issue