mac80211: update to backports-4.14-rc2

[openwrt/staging/lynxis.git] / package / kernel / mac80211 / patches / 600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch

diff --git a/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch b/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch
index aa3ead6ee8a397ec6c279e600d841eb3fcb4a863..c0f1f5863b4f318f429795a305d2bf35dbc33077 100644 (file)
--- a/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch
+++ b/package/kernel/mac80211/patches/600-10-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch
@@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  #define RFCSR2_TX2_EN_MT7620          FIELD8(0x20)
 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
-@@ -7701,6 +7701,144 @@ static void rt2800_init_rfcsr_5350(struc
+@@ -7707,6 +7707,144 @@ static void rt2800_init_rfcsr_5350(struc
        rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
  }
  
@@ -134,7 +134,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 +              rt2800_rfcsr_write(rt2x00dev, 33, 0x32);
 +      }
 +
-+      rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
++      rfcsr = rt2800_rfcsr_read(rt2x00dev, 2);
 +      rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_BP, 0);
 +      rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);
 +      rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
@@ -142,23 +142,23 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 +      rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 0);
 +      rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
 +
-+      rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
++      rfcsr = rt2800_rfcsr_read(rt2x00dev, 1);
 +      rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
 +      rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
 +
-+      rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
++      rfcsr = rt2800_rfcsr_read(rt2x00dev, 6);
 +      rfcsr |= 0xc0;
 +      rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);
 +
-+      rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
++      rfcsr = rt2800_rfcsr_read(rt2x00dev, 22);
 +      rfcsr |= 0x20;
 +      rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);
 +
-+      rt2800_rfcsr_read(rt2x00dev, 46, &rfcsr);
++      rfcsr = rt2800_rfcsr_read(rt2x00dev, 46);
 +      rfcsr |= 0x20;
 +      rt2800_rfcsr_write(rt2x00dev, 46, rfcsr);
 +
-+      rt2800_rfcsr_read(rt2x00dev, 20, &rfcsr);
++      rfcsr = rt2800_rfcsr_read(rt2x00dev, 20);
 +      rfcsr &= ~0xee;
 +      rt2800_rfcsr_write(rt2x00dev, 20, rfcsr);
 +}
@@ -166,7 +166,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
  {
        rt2800_rf_init_calibration(rt2x00dev, 2);
-@@ -8543,6 +8681,9 @@ static void rt2800_init_rfcsr(struct rt2
+@@ -8549,6 +8687,9 @@ static void rt2800_init_rfcsr(struct rt2
        case RT3390:
                rt2800_init_rfcsr_3390(rt2x00dev);
                break;