diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-25 09:31:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-25 09:31:04 +0000 |
| commit | e0e9884d41f9688c270a7c968a95eca29feea350 (patch) | |
| tree | a07e0319bf86e6537435491a6a0d1d3d4f9af0e3 | |
| parent | b742aa376ac6fcc59e4709f1c54886bd6090f1b0 (diff) | |
| download | upstream-e0e9884d41f9688c270a7c968a95eca29feea350.tar.gz upstream-e0e9884d41f9688c270a7c968a95eca29feea350.tar.bz2 upstream-e0e9884d41f9688c270a7c968a95eca29feea350.zip | |
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
| -rw-r--r-- | package/kernel/mac80211/patches/403-ath_regd_optional.patch | 7 |
1 files 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 |