2 files changed, 8 insertions, 0 deletions

diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index b03ddee3341d..92ab80f69efe 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -123,12 +123,17 @@ struct regulatory_request {
  *      derived from the regulatory domain. The regulatory domain used will be
  *      based on the ISO3166-alpha2 from country IE provided through
  *      regulatory_hint_country_ie()
+ * @REGULATORY_COUNTRY_IE_IGNORE: for devices that have a preference to ignore
+ *      all country IE information processed by the regulatory core. This will
+ *      override %REGULATORY_COUNTRY_IE_FOLLOW_POWER as all country IEs will
+ *      be ignored.
  */
 enum ieee80211_regulatory_flags {
         REGULATORY_CUSTOM_REG                   = BIT(0),
         REGULATORY_STRICT_REG                   = BIT(1),
         REGULATORY_DISABLE_BEACON_HINTS         = BIT(2),
         REGULATORY_COUNTRY_IE_FOLLOW_POWER      = BIT(3),
+        REGULATORY_COUNTRY_IE_IGNORE            = BIT(4),
 };
 
 struct ieee80211_freq_range {
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 6b3051f6a8a7..067c1f63a1ae 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1543,6 +1543,9 @@ __reg_process_hint_country_ie(struct wiphy *wiphy,
                 if (regdom_changes(country_ie_request->alpha2))
                         return REG_REQ_IGNORE;
                 return REG_REQ_ALREADY_SET;
+        } else {
+                if (wiphy->regulatory_flags & REGULATORY_COUNTRY_IE_IGNORE)
+                        return REG_REQ_IGNORE;
         }
 
         if (unlikely(!is_an_alpha2(country_ie_request->alpha2)))