diff options
| author | Felix Fietkau <nbd@nbd.name> | 2019-05-31 22:03:11 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2019-06-27 12:58:13 +0200 |
| commit | 0995257242ebe8439df09fc7c2ff312ccf183754 (patch) | |
| tree | 55c6c04a625f2e8de0bef08054d95c48dd7e499a /drivers/net/wireless/mediatek/mt76/mt76x2/init.c | |
| parent | b0297b6738b20d6e6e4dfa7d5f73d544ffba0f4d (diff) | |
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>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt76x2/init.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt76x2/init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c index c6078e90ca43..97c3543eed8a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/init.c @@ -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); |