1 --- a/drivers/net/wireless/ath/regd.c
2 +++ b/drivers/net/wireless/ath/regd.c
3 @@ -115,6 +115,16 @@ static const struct ieee80211_regdomain
7 +static u16 ath_regd_get_eepromRD(struct ath_regulatory *reg)
9 + return reg->current_rd & ~WORLDWIDE_ROAMING_FLAG;
12 +static bool is_default_regd(struct ath_regulatory *reg)
14 + return ath_regd_get_eepromRD(reg) == CTRY_DEFAULT;
17 static bool dynamic_country_user_possible(struct ath_regulatory *reg)
19 if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
20 @@ -123,6 +133,9 @@ static bool dynamic_country_user_possibl
21 if (IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING))
24 + if (is_default_regd(reg))
27 switch (reg->country_code) {
28 case CTRY_UNITED_STATES:
30 @@ -208,11 +221,6 @@ static inline bool is_wwr_sku(u16 regd)
34 -static u16 ath_regd_get_eepromRD(struct ath_regulatory *reg)
36 - return reg->current_rd & ~WORLDWIDE_ROAMING_FLAG;
39 bool ath_is_world_regd(struct ath_regulatory *reg)
41 return is_wwr_sku(ath_regd_get_eepromRD(reg));
42 @@ -658,6 +666,9 @@ ath_regd_init_wiphy(struct ath_regulator
43 if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
46 + if (is_default_regd(reg))
49 wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
50 REGULATORY_CUSTOM_REG;