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

Commit 21fdc872 authored by Daniel Halperin's avatar Daniel Halperin Committed by John W. Linville
Browse files

ath9k: fix two more bugs in tx power 



This is the same fix as

   commit 84105160
   Author: Matteo Croce <technoboy85@gmail.com>
   Date:   Fri Dec 3 02:25:08 2010 +0100

   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.

in two more places. I grepped the ath tree and didn't find any others.

Cc: stable@kernel.org
Signed-off-by: default avatarDaniel Halperin <dhalperi@cs.washington.edu>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 333ba732

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

+8 −2
Original line number Diff line number Diff line
@@ -4645,10 +4645,16 @@ static void ar9003_hw_set_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;

	}

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

+8 −2
Original line number Diff line number Diff line
@@ -524,10 +524,16 @@ static void ath9k_hw_set_ar9287_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);