Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09952572 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

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: default avatarFelix Fietkau <nbd@nbd.name>
parent b0297b67

drivers/net/wireless/mediatek/mt76/mt7603/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

}

drivers/net/wireless/mediatek/mt76/mt76x0/init.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/net/wireless/mediatek/mt76/mt76x2/init.c

+5 −4
Original line number Diff line number Diff line
@@ -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);