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>
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From 6d668fef3a1baa60bdd715ee062ddb6333d2647c Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Mon, 30 Sep 2013 16:58:23 +0200
|
|
Subject: [PATCH] rt2x00: rt2800lib: fix LNA gain configuration 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
|
|
@@ -2036,7 +2036,8 @@ static void rt2800_config_lna_gain(struc
|
|
rt2800_eeprom_read(rt2x00dev, EEPROM_LNA, &eeprom);
|
|
lna_gain = rt2x00_get_field16(eeprom, EEPROM_LNA_A0);
|
|
} else if (libconf->rf.channel <= 128) {
|
|
- if (rt2x00_rt(rt2x00dev, RT3593)) {
|
|
+ if (rt2x00_rt(rt2x00dev, RT3593) ||
|
|
+ rt2x00_rt(rt2x00dev, RT3883)) {
|
|
rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &eeprom);
|
|
lna_gain = rt2x00_get_field16(eeprom,
|
|
EEPROM_EXT_LNA2_A1);
|
|
@@ -2046,7 +2047,8 @@ static void rt2800_config_lna_gain(struc
|
|
EEPROM_RSSI_BG2_LNA_A1);
|
|
}
|
|
} else {
|
|
- if (rt2x00_rt(rt2x00dev, RT3593)) {
|
|
+ if (rt2x00_rt(rt2x00dev, RT3593) ||
|
|
+ rt2x00_rt(rt2x00dev, RT3883)) {
|
|
rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &eeprom);
|
|
lna_gain = rt2x00_get_field16(eeprom,
|
|
EEPROM_EXT_LNA2_A2);
|