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

Commit 84105160 authored by Matteo Croce's avatar Matteo Croce Committed by John W. Linville
Browse files

ath9k: fix bug in tx power 



The ath9k driver subtracts 3 dBm to the txpower as with two radios the
signal power is doubled.
The resulting value is assigned in an u16 which overflows and makes
the card work at full power.

Cc: stable@kernel.org
Signed-off-by: default avatarMatteo Croce <matteo@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d89197c7

drivers/net/wireless/ath/ath9k/eeprom_def.c

+8 −4
Original line number Diff line number Diff line
@@ -1063,15 +1063,19 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, 
	case 1:

		break;

	case 2:

		if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)

			scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;

		else

			scaledPower = 0;

		break;

	case 3:

		if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN)

			scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;

		else

			scaledPower = 0;

		break;

	}



	scaledPower = max((u16)0, scaledPower);



	if (IS_CHAN_2GHZ(chan)) {

		numCtlModes = ARRAY_SIZE(ctlModesFor11g) -

			SUB_NUM_CTL_MODES_AT_2G_40;