diff options
| -rw-r--r-- | package/kernel/mac80211/patches/402-ath_regd_optional.patch | 47 | ||||
| -rw-r--r-- | package/kernel/mac80211/patches/406-ath_relax_default_regd.patch | 12 |
2 files changed, 38 insertions, 21 deletions
diff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch index 463428371b..7a7c2d4174 100644 --- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch +++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch @@ -1,46 +1,61 @@ --- 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 +@@ -116,6 +116,9 @@ static const struct ieee80211_regdomain + + static bool dynamic_country_user_possible(struct ath_regulatory *reg) + { ++ if (IS_ENABLED(CPTCFG_ATH_USER_REGD)) ++ return true; ++ + if (IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING)) + return true; + +@@ -188,6 +191,8 @@ static bool dynamic_country_user_possibl + + static bool ath_reg_dyn_country_user_allow(struct ath_regulatory *reg) + { ++ if (IS_ENABLED(CPTCFG_ATH_USER_REGD)) ++ return true; + if (!IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_REG_HINTS)) + return false; + if (!dynamic_country_user_possible(reg)) +@@ -341,6 +346,9 @@ ath_reg_apply_beaconing_flags(struct wip struct ieee80211_channel *ch; unsigned int i; -+#ifdef CPTCFG_ATH_USER_REGD -+ return; -+#endif ++ if (IS_ENABLED(CPTCFG_ATH_USER_REGD)) ++ return; + for (band = 0; band < NUM_NL80211_BANDS; band++) { if (!wiphy->bands[band]) continue; -@@ -374,6 +378,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip +@@ -374,6 +382,9 @@ ath_reg_apply_ir_flags(struct wiphy *wip { struct ieee80211_supported_band *sband; -+#ifdef CPTCFG_ATH_USER_REGD -+ return; -+#endif ++ if (IS_ENABLED(CPTCFG_ATH_USER_REGD)) ++ return; + sband = wiphy->bands[NL80211_BAND_2GHZ]; if (!sband) return; -@@ -402,6 +410,10 @@ static void ath_reg_apply_radar_flags(st +@@ -402,6 +413,9 @@ static void ath_reg_apply_radar_flags(st struct ieee80211_channel *ch; unsigned int i; -+#ifdef CPTCFG_ATH_USER_REGD -+ return; -+#endif ++ if (IS_ENABLED(CPTCFG_ATH_USER_REGD)) ++ return; + if (!wiphy->bands[NL80211_BAND_5GHZ]) return; -@@ -633,6 +645,11 @@ ath_regd_init_wiphy(struct ath_regulator +@@ -633,6 +647,10 @@ 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 ++ if (IS_ENABLED(CPTCFG_ATH_USER_REGD)) ++ return 0; + wiphy->regulatory_flags |= REGULATORY_STRICT_REG | REGULATORY_CUSTOM_REG; diff --git a/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch b/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch index 0598fa34f1..5b20b4518e 100644 --- a/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch +++ b/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c -@@ -114,11 +114,24 @@ static const struct ieee80211_regdomain +@@ -114,6 +114,16 @@ static const struct ieee80211_regdomain ) }; @@ -16,6 +16,8 @@ + static bool dynamic_country_user_possible(struct ath_regulatory *reg) { + if (IS_ENABLED(CPTCFG_ATH_USER_REGD)) +@@ -122,6 +132,9 @@ static bool dynamic_country_user_possibl if (IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING)) return true; @@ -25,7 +27,7 @@ switch (reg->country_code) { case CTRY_UNITED_STATES: case CTRY_JAPAN1: -@@ -202,11 +215,6 @@ static inline bool is_wwr_sku(u16 regd) +@@ -207,11 +220,6 @@ static inline bool is_wwr_sku(u16 regd) (regd == WORLD)); } @@ -37,9 +39,9 @@ bool ath_is_world_regd(struct ath_regulatory *reg) { return is_wwr_sku(ath_regd_get_eepromRD(reg)); -@@ -650,6 +658,9 @@ ath_regd_init_wiphy(struct ath_regulator - return 0; - #endif +@@ -651,6 +659,9 @@ ath_regd_init_wiphy(struct ath_regulator + if (IS_ENABLED(CPTCFG_ATH_USER_REGD)) + return 0; + if (is_default_regd(reg)) + return 0; |