It's not clear for my why we should add 3dBm for 2x2 devices and not for 1x1. 3dBm looks rater like minimal txpower and hardware transmit at 3dBm + dev->txpower_cur / 2 .
With the change reported txpower value are closer to regulatory values, but honestly I have no idea what should be reported. Perhaps also some better comment should be added. Signed-off-by: Stanislaw Gruszka <[email protected]> --- drivers/net/wireless/mediatek/mt76/mac80211.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index 851caabbecda..b04652729112 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -733,15 +733,9 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, int *dbm) { struct mt76_dev *dev = hw->priv; - int n_chains = hweight8(dev->antenna_mask); *dbm = dev->txpower_cur / 2; - - /* convert from per-chain power to combined - * output on 2x2 devices - */ - if (n_chains > 1) - *dbm += 3; + *dbm += 3; return 0; } -- 1.9.3
