mt76: fix setting chan->max_power
When setting chan->max_power after registering the wiphy, chan->max_reg_power needs to be used as a limit Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
parent
b0297b6738
commit
0995257242
|
@ -494,7 +494,7 @@ mt7603_init_txpower(struct mt7603_dev *dev,
|
|||
|
||||
for (i = 0; i < sband->n_channels; i++) {
|
||||
chan = &sband->channels[i];
|
||||
chan->max_power = target_power;
|
||||
chan->max_power = min_t(int, chan->max_reg_power, target_power);
|
||||
chan->orig_mpwr = target_power;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -279,8 +279,9 @@ mt76x0_init_txpower(struct mt76x02_dev *dev,
|
|||
mt76x0_get_tx_power_per_rate(dev, chan, &t);
|
||||
mt76x0_get_power_info(dev, chan, &tp);
|
||||
|
||||
chan->max_power = (mt76x02_get_max_rate_power(&t) + tp) / 2;
|
||||
chan->orig_mpwr = chan->max_power;
|
||||
chan->orig_mpwr = (mt76x02_get_max_rate_power(&t) + tp) / 2;
|
||||
chan->max_power = min_t(int, chan->max_reg_power,
|
||||
chan->orig_mpwr);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -173,13 +173,14 @@ void mt76x2_init_txpower(struct mt76x02_dev *dev,
|
|||
mt76x2_get_power_info(dev, &txp, chan);
|
||||
mt76x2_get_rate_power(dev, &t, chan);
|
||||
|
||||
chan->max_power = mt76x02_get_max_rate_power(&t) +
|
||||
chan->orig_mpwr = mt76x02_get_max_rate_power(&t) +
|
||||
txp.target_power;
|
||||
chan->max_power = DIV_ROUND_UP(chan->max_power, 2);
|
||||
chan->orig_mpwr = DIV_ROUND_UP(chan->orig_mpwr, 2);
|
||||
|
||||
/* convert to combined output power on 2x2 devices */
|
||||
chan->max_power += 3;
|
||||
chan->orig_mpwr = chan->max_power;
|
||||
chan->orig_mpwr += 3;
|
||||
chan->max_power = min_t(int, chan->max_reg_power,
|
||||
chan->orig_mpwr);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(mt76x2_init_txpower);
|
||||
|
|
Loading…
Reference in a new issue