mac80211: update to backports-4.14-rc2

[openwrt/staging/lynxis.git] / package / kernel / mac80211 / patches / 600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch

diff --git a/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch b/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch
index 6e9ef1071cfa6ca73fd6bf68e2a8377311888dee..4bbc7ae44e6c4f13682072fe6b0e5fb02f5dae60 100644 (file)
--- a/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch
+++ b/package/kernel/mac80211/patches/600-21-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch
@@ -10,8 +10,8 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-@@ -9092,7 +9092,8 @@ static int rt2800_validate_eeprom(struct
-       rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &word);
+@@ -9098,7 +9098,8 @@ static int rt2800_validate_eeprom(struct
+       word = rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2);
        if (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG2_OFFSET2)) > 10)
                rt2x00_set_field16(&word, EEPROM_RSSI_BG2_OFFSET2, 0);
 -      if (!rt2x00_rt(rt2x00dev, RT3593)) {
@@ -20,8 +20,8 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
                if (rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0x00 ||
                    rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0xff)
                        rt2x00_set_field16(&word, EEPROM_RSSI_BG2_LNA_A1,
-@@ -9112,7 +9113,8 @@ static int rt2800_validate_eeprom(struct
-       rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &word);
+@@ -9118,7 +9119,8 @@ static int rt2800_validate_eeprom(struct
+       word = rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2);
        if (abs(rt2x00_get_field16(word, EEPROM_RSSI_A2_OFFSET2)) > 10)
                rt2x00_set_field16(&word, EEPROM_RSSI_A2_OFFSET2, 0);
 -      if (!rt2x00_rt(rt2x00dev, RT3593)) {
@@ -30,13 +30,13 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
                if (rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0x00 ||
                    rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0xff)
                        rt2x00_set_field16(&word, EEPROM_RSSI_A2_LNA_A2,
-@@ -9120,7 +9122,8 @@ static int rt2800_validate_eeprom(struct
+@@ -9126,7 +9128,8 @@ static int rt2800_validate_eeprom(struct
        }
        rt2800_eeprom_write(rt2x00dev, EEPROM_RSSI_A2, word);
  
 -      if (rt2x00_rt(rt2x00dev, RT3593)) {
 +      if (rt2x00_rt(rt2x00dev, RT3593) ||
 +          rt2x00_rt(rt2x00dev, RT3883)) {
-               rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &word);
+               word = rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2);
                if (rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0x00 ||
                    rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0xff)