mac80211: update to wireless-testing 2014-09-26

[openwrt/staging/mkresin.git] / package / kernel / mac80211 / patches / 600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch

diff --git a/package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch b/package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch
index 65c67205eed7d128fbb521fe0402b0aaff79542e..af040b83a709e95c390be5c21cd3370361853441 100644 (file)
--- a/package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch
+++ b/package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch
@@ -12,7 +12,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/net/wireless/rt2x00/rt2800.h
 +++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -1586,6 +1586,20 @@
+@@ -1588,6 +1588,20 @@
  #define TX_PWR_CFG_9_STBC7_CH2                FIELD32(0x00000f00)
  
  /*
@@ -35,7 +35,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  #define RX_FILTER_CFG                 0x1400
 --- a/drivers/net/wireless/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4995,6 +4995,12 @@ static int rt2800_init_registers(struct 
+@@ -4998,6 +4998,12 @@ static int rt2800_init_registers(struct 
                        rt2800_register_write(rt2x00dev, TX_SW_CFG2,
                                              0x00000000);
                }
@@ -48,7 +48,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
        } else if (rt2x00_rt(rt2x00dev, RT5390) ||
                   rt2x00_rt(rt2x00dev, RT5392) ||
                   rt2x00_rt(rt2x00dev, RT5592)) {
-@@ -5025,9 +5031,11 @@ static int rt2800_init_registers(struct 
+@@ -5028,9 +5034,11 @@ static int rt2800_init_registers(struct 
  
        rt2800_register_read(rt2x00dev, MAX_LEN_CFG, &reg);
        rt2x00_set_field32(&reg, MAX_LEN_CFG_MAX_MPDU, AGGREGATION_SIZE);
@@ -63,7 +63,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
                rt2x00_set_field32(&reg, MAX_LEN_CFG_MAX_PSDU, 2);
        else
                rt2x00_set_field32(&reg, MAX_LEN_CFG_MAX_PSDU, 1);
-@@ -5180,6 +5188,11 @@ static int rt2800_init_registers(struct 
+@@ -5183,6 +5191,11 @@ static int rt2800_init_registers(struct 
        reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
        rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);