69 lines
1.5 KiB
Diff
69 lines
1.5 KiB
Diff
--- a/drivers/net/wireless/ath/regd.c
|
|
+++ b/drivers/net/wireless/ath/regd.c
|
|
@@ -341,6 +341,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 < IEEE80211_NUM_BANDS; band++) {
|
|
if (!wiphy->bands[band])
|
|
continue;
|
|
@@ -374,6 +378,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip
|
|
{
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
+#ifdef CPTCFG_ATH_USER_REGD
|
|
+ return;
|
|
+#endif
|
|
+
|
|
sband = wiphy->bands[IEEE80211_BAND_2GHZ];
|
|
if (!sband)
|
|
return;
|
|
@@ -402,6 +410,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[IEEE80211_BAND_5GHZ])
|
|
return;
|
|
|
|
@@ -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->regulatory_flags |= REGULATORY_STRICT_REG |
|
|
REGULATORY_CUSTOM_REG;
|
|
|
|
--- a/drivers/net/wireless/ath/Kconfig
|
|
+++ b/drivers/net/wireless/ath/Kconfig
|
|
@@ -23,6 +23,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/.local-symbols
|
|
+++ b/.local-symbols
|
|
@@ -125,6 +125,7 @@ ADM8211=
|
|
ATH_COMMON=
|
|
WLAN_VENDOR_ATH=
|
|
ATH_DEBUG=
|
|
+ATH_USER_REGD=
|
|
ATH_TRACEPOINTS=
|
|
ATH_REG_DYNAMIC_USER_REG_HINTS=
|
|
ATH_REG_DYNAMIC_USER_CERT_TESTING=
|