From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Mon, 22 Feb 2010 06:38:42 +0000 (+0200)
Subject: wl1271: Remove tx-power level workaround
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~26105^2~714^2~86
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6f6b5d49105eba1be0b2ef0c04a4571f20793778;p=mirror_ubuntu-focal-kernel.git

wl1271: Remove tx-power level workaround

This patch removes the workaround limiting chipset TX power to 12dB, instead
using the value configured by the mac80211.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/wl1271_acx.c
index f41f886741f1..60e20876e6d8 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.c
@@ -135,12 +135,7 @@ int wl1271_acx_tx_power(struct wl1271 *wl, int power)
 		goto out;
 	}
 
-	/*
-	 * FIXME: This is a workaround needed while we don't the correct
-	 * calibration, to avoid distortions
-	 */
-	/* acx->current_tx_power = power * 10; */
-	acx->current_tx_power = 120;
+	acx->current_tx_power = power * 10;
 
 	ret = wl1271_cmd_configure(wl, DOT11_CUR_TX_PWR, acx, sizeof(*acx));
 	if (ret < 0) {