399d5cf532
Some of our local patches have been accepted upstream. And there are some more relevant changes (mostly for rt2800usb). Import them and rebase our remaining local patches on top. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
30 lines
1 KiB
Diff
30 lines
1 KiB
Diff
From e37d93abaabe3ab72b0332a18092acc162307274 Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Mon, 30 Sep 2013 13:57:26 +0200
|
|
Subject: [PATCH] rt2x00: rt2800lib: fix txpower_to_dev function for RT3883
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -3720,13 +3720,15 @@ static char rt2800_txpower_to_dev(struct
|
|
unsigned int channel,
|
|
char txpower)
|
|
{
|
|
- if (rt2x00_rt(rt2x00dev, RT3593))
|
|
+ if (rt2x00_rt(rt2x00dev, RT3593) ||
|
|
+ rt2x00_rt(rt2x00dev, RT3883))
|
|
txpower = rt2x00_get_field8(txpower, EEPROM_TXPOWER_ALC);
|
|
|
|
if (channel <= 14)
|
|
return clamp_t(char, txpower, MIN_G_TXPOWER, MAX_G_TXPOWER);
|
|
|
|
- if (rt2x00_rt(rt2x00dev, RT3593))
|
|
+ if (rt2x00_rt(rt2x00dev, RT3593) ||
|
|
+ rt2x00_rt(rt2x00dev, RT3883))
|
|
return clamp_t(char, txpower, MIN_A_TXPOWER_3593,
|
|
MAX_A_TXPOWER_3593);
|
|
else
|