Skip to contentSkip to conversation

: ath9k: fix bug in tx power

PATCH New Matteo Croce 3 participants 5 messages Dec 2, 2010 – Dec 3, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : 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 to work at full power.

--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c 2010-12-02
22:39:58.982020001 +0100
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c 2010-12-02
23:05:43.662020001 +0100
@@ -1065,15 +1065,19 @@
case 1:
break;
case 2:
- scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+ if(scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)
+ scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+ else
+ scaledPower = 0;
break;
case 3:
- scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
+ 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;

Signature · 12 lines
Matteo Croce
OpenWrt developer
? _______? ? ? ? ? ? ? ? ? ?? ________? ? ? ? __
?|? ? ?? |.-----.-----.-----.|? |? |? |.----.|? |_
?|?? -?? ||? _? |? -__|? ?? ||? |? |? ||?? _||?? _|
?|_______||?? __|_____|__|__||________||__|? |____|
? ? ? ? ? |__| W I R E L E S S?? F R E E D O M
?KAMIKAZE (bleeding edge) ------------------
? * 10 oz Vodka? ? ?? Shake well with ice and strain
? * 10 oz Triple sec? mixture into 10 shot glasses.
? * 10 oz lime juice? Salute!
?---------------------------------------------------
#1 lore raw

PATCH 1/1 : ath9k: fix bug in tx power

Quoted 4 lines · Matteo Croce

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 to work at full power.

Thanks for the patch Matteo, can you please reword a bit better and resubmit by first using checkpatch.pl against the patch? The branch should be separated by a space.

Luis

#2 lore raw

PATCH 1/1 : 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.

--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c 2010-12-02
22:39:58.982020001 +0100
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c 2010-12-03
00:36:23.637799002 +0100
@@ -1065,15 +1065,19 @@
case 1:
break;
case 2:
- scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+ if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)
+ scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+ else
+ scaledPower = 0;
break;
case 3:
- scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
+ 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;

#3 lore raw

PATCH 1/1 : ath9k: fix bug in tx power

Quoted 4 lines · Matteo Croce

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.

Sorry can you also add:

Cc stable at kernel.org

Right above your Signed-off-by, this is a regulatory fix, thanks.

Luis

Quoted 35 lines

--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c 2010-12-02
22:39:58.982020001 +0100
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c 2010-12-03
00:36:23.637799002 +0100

(quoted diff) +8 -4
@@ -1065,15 +1065,19 @@
 	case 1:
 		break;
 	case 2:
-		scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+		if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)
+			scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+		else
+			scaledPower = 0;
 		break;
 	case 3:
-		scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
+		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;

_______________________________________________
ath9k-devel mailing list
ath9k-devel at lists.ath9k.org
https://lists.ath9k.org/mailman/listinfo/ath9k-devel

#4 lore raw

PATCH 1/1 : 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 at kernel.org

--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c 2010-12-02
22:39:58.982020001 +0100
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c 2010-12-03
00:36:23.637799002 +0100
@@ -1065,15 +1065,19 @@
case 1:
break;
case 2:
- scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+ if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)
+ scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
+ else
+ scaledPower = 0;
break;
case 3:
- scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
+ 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;