package/mac80211/patches/560-cfg80211_max_power.patch

   1 --- a/net/wireless/reg.c
   2 +++ b/net/wireless/reg.c
   3 @@ -839,6 +839,12 @@ static void handle_channel(struct wiphy
   4         if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(40))
   5                 bw_flags = IEEE80211_CHAN_NO_HT40;
   6
   7 +       if (chan->orig_mpwr)
   8 +               chan->max_power = min(chan->orig_mpwr,
   9 +                       (int) MBM_TO_DBM(power_rule->max_eirp));
  10 +       else
  11 +               chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
  12 +
  13         if (last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER &&
  14             request_wiphy && request_wiphy == wiphy &&
  15             request_wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) {
  16 @@ -851,19 +857,12 @@ static void handle_channel(struct wiphy
  17                         map_regdom_flags(reg_rule->flags) | bw_flags;
  18                 chan->max_antenna_gain = chan->orig_mag =
  19                         (int) MBI_TO_DBI(power_rule->max_antenna_gain);
  20 -               chan->max_power = chan->orig_mpwr =
  21 -                       (int) MBM_TO_DBM(power_rule->max_eirp);
  22                 return;
  23         }
  24
  25         chan->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags);
  26         chan->max_antenna_gain = min(chan->orig_mag,
  27                 (int) MBI_TO_DBI(power_rule->max_antenna_gain));
  28 -       if (chan->orig_mpwr)
  29 -               chan->max_power = min(chan->orig_mpwr,
  30 -                       (int) MBM_TO_DBM(power_rule->max_eirp));
  31 -       else
  32 -               chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
  33  }
  34
  35  static void handle_band(struct wiphy *wiphy,