| Message ID | 1349286707-64433-2-git-send-email-nbd@openwrt.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Same here -- anyone object? I suspect that Johannes may be a little more busy/distracted than usual for the next few days/weeks... John On Wed, Oct 03, 2012 at 07:51:47PM +0200, Felix Fietkau wrote: > A few places touch chan->max_power based on updated tx power rules, but > forget to do the same to chan->max_reg_power. > > Signed-off-by: Felix Fietkau <nbd@openwrt.org> > Cc: stable@vger.kernel.org > --- > net/wireless/reg.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/net/wireless/reg.c b/net/wireless/reg.c > index 1a16f19..7062475 100644 > --- a/net/wireless/reg.c > +++ b/net/wireless/reg.c > @@ -908,7 +908,7 @@ static void handle_channel(struct wiphy *wiphy, > map_regdom_flags(reg_rule->flags) | bw_flags; > chan->max_antenna_gain = chan->orig_mag = > (int) MBI_TO_DBI(power_rule->max_antenna_gain); > - chan->max_power = chan->orig_mpwr = > + chan->max_reg_power = chan->max_power = chan->orig_mpwr = > (int) MBM_TO_DBM(power_rule->max_eirp); > return; > } > @@ -1330,7 +1330,8 @@ static void handle_channel_custom(struct wiphy *wiphy, > > chan->flags |= map_regdom_flags(reg_rule->flags) | bw_flags; > chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain); > - chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp); > + chan->max_reg_power = chan->max_power = > + (int) MBM_TO_DBM(power_rule->max_eirp); > } > > static void handle_band_custom(struct wiphy *wiphy, enum ieee80211_band band, > -- > 1.7.9.6 (Apple Git-31.1) > >
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 1a16f19..7062475 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -908,7 +908,7 @@ static void handle_channel(struct wiphy *wiphy, map_regdom_flags(reg_rule->flags) | bw_flags; chan->max_antenna_gain = chan->orig_mag = (int) MBI_TO_DBI(power_rule->max_antenna_gain); - chan->max_power = chan->orig_mpwr = + chan->max_reg_power = chan->max_power = chan->orig_mpwr = (int) MBM_TO_DBM(power_rule->max_eirp); return; } @@ -1330,7 +1330,8 @@ static void handle_channel_custom(struct wiphy *wiphy, chan->flags |= map_regdom_flags(reg_rule->flags) | bw_flags; chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain); - chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp); + chan->max_reg_power = chan->max_power = + (int) MBM_TO_DBM(power_rule->max_eirp); } static void handle_band_custom(struct wiphy *wiphy, enum ieee80211_band band,
A few places touch chan->max_power based on updated tx power rules, but forget to do the same to chan->max_reg_power. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Cc: stable@vger.kernel.org --- net/wireless/reg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)