2 files changed, 19 insertions, 5 deletions

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 5eda5933ae01..9f85fca0b676 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1699,7 +1699,9 @@ struct cfg80211_ops {
  *      regulatory domain no user regulatory domain can enable these channels
  *      at a later time. This can be used for devices which do not have
  *      calibration information guaranteed for frequencies or settings
- *      outside of its regulatory domain.
+ *      outside of its regulatory domain. If used in combination with
+ *      WIPHY_FLAG_CUSTOM_REGULATORY the inspected country IE power settings
+ *      will be followed.
  * @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure
  *      that passive scan flags and beaconing flags may not be lifted by
  *      cfg80211 due to regulatory beacon hints. For more information on beacon
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 2f5b0505c95d..481caafc6ba5 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -873,10 +873,22 @@ static void handle_channel(struct wiphy *wiphy,
         chan->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags);
         chan->max_antenna_gain = min(chan->orig_mag,
                 (int) MBI_TO_DBI(power_rule->max_antenna_gain));
-        if (chan->orig_mpwr)
-                chan->max_power = min(chan->orig_mpwr,
-                        (int) MBM_TO_DBM(power_rule->max_eirp));
-        else
+        if (chan->orig_mpwr) {
+                /*
+                 * Devices that have their own custom regulatory domain
+                 * but also use WIPHY_FLAG_STRICT_REGULATORY will follow the
+                 * passed country IE power settings.
+                 */
+                if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE &&
+                    wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY &&
+                    wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) {
+                        chan->max_power =
+                                MBM_TO_DBM(power_rule->max_eirp);
+                } else {
+                        chan->max_power = min(chan->orig_mpwr,
+                                (int) MBM_TO_DBM(power_rule->max_eirp));
+                }
+        } else
                 chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
 }