--- a/drivers/net/wireless/ath/Kconfig +++ b/drivers/net/wireless/ath/Kconfig @@ -24,6 +24,9 @@ config WLAN_VENDOR_ATH if WLAN_VENDOR_ATH +config ATH_USER_REGD + bool "Do not enforce EEPROM regulatory restrictions" + config ATH_DEBUG bool "Atheros wireless debugging" ---help--- --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c @@ -345,6 +345,10 @@ ath_reg_apply_beaconing_flags(struct wip struct ieee80211_channel *ch; unsigned int i; +#ifdef CPTCFG_ATH_USER_REGD + return; +#endif + for (band = 0; band < NUM_NL80211_BANDS; band++) { if (!wiphy->bands[band]) continue; @@ -378,6 +382,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip { struct ieee80211_supported_band *sband; +#ifdef CPTCFG_ATH_USER_REGD + return; +#endif + sband = wiphy->bands[NL80211_BAND_2GHZ]; if (!sband) return; @@ -407,6 +415,10 @@ static void ath_reg_apply_radar_flags(st struct ieee80211_channel *ch; unsigned int i; +#ifdef CPTCFG_ATH_USER_REGD + return; +#endif + if (!wiphy->bands[NL80211_BAND_5GHZ]) return; @@ -638,6 +650,10 @@ ath_regd_init_wiphy(struct ath_regulator { const struct ieee80211_regdomain *regd; +#ifdef CPTCFG_ATH_USER_REGD + return 0; +#endif + wiphy->reg_notifier = reg_notifier; wiphy->regulatory_flags |= REGULATORY_STRICT_REG | REGULATORY_CUSTOM_REG; --- a/local-symbols +++ b/local-symbols @@ -83,6 +83,7 @@ VIRT_WIFI= ATH_COMMON= WLAN_VENDOR_ATH= ATH_DEBUG= +ATH_USER_REGD= ATH_TRACEPOINTS= ATH_REG_DYNAMIC_USER_REG_HINTS= ATH_REG_DYNAMIC_USER_CERT_TESTING=