ath9k: fix an rx descriptor processing race condition

[openwrt.git] / package / kernel / mac80211 / patches / 616-rt2x00-support-rt5350.patch

diff --git a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
index ba1b910..88ed277 100644 (file)
--- a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
+++ b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
@@ -60,17 +60,16 @@
        case RF5360:
        case RF5370:
        case RF5372:
-@@ -3563,7 +3576,8 @@ static int rt2800_init_registers(struct 
-       } else if (rt2x00_rt(rt2x00dev, RT3572)) {
-               rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);
-               rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
--      } else if (rt2x00_rt(rt2x00dev, RT5390) ||
-+      } else if (rt2x00_rt(rt2x00dev, RT5350) ||
-+                 rt2x00_rt(rt2x00dev, RT5390) ||
-                  rt2x00_rt(rt2x00dev, RT5392) ||
-                  rt2x00_rt(rt2x00dev, RT5592)) {
+@@ -3569,6 +3582,8 @@ static int rt2800_init_registers(struct 
                rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
-@@ -4216,9 +4230,13 @@ static void rt2800_init_bbp_3352(struct 
+               rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
+               rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
++      } else if (rt2x00_rt(rt2x00dev, RT5350)) {
++              rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
+       } else {
+               rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);
+               rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
+@@ -4216,9 +4231,13 @@ static void rt2800_init_bbp_3352(struct 
  
        rt2800_bbp_write(rt2x00dev, 82, 0x62);
  
@@ -87,7 +86,7 @@
  
        rt2800_bbp_write(rt2x00dev, 86, 0x38);
  
-@@ -4232,9 +4250,13 @@ static void rt2800_init_bbp_3352(struct 
+@@ -4232,9 +4251,13 @@ static void rt2800_init_bbp_3352(struct 
  
        rt2800_bbp_write(rt2x00dev, 104, 0x92);
  
@@ -104,7 +103,7 @@
  
        rt2800_bbp_write(rt2x00dev, 120, 0x50);
  
-@@ -4259,6 +4281,13 @@ static void rt2800_init_bbp_3352(struct 
+@@ -4259,6 +4282,13 @@ static void rt2800_init_bbp_3352(struct 
        rt2800_bbp_write(rt2x00dev, 143, 0xa2);
  
        rt2800_bbp_write(rt2x00dev, 148, 0xc8);
@@ -118,7 +117,7 @@
  }
  
  static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev)
-@@ -4543,6 +4572,7 @@ static void rt2800_init_bbp(struct rt2x0
+@@ -4543,6 +4573,7 @@ static void rt2800_init_bbp(struct rt2x0
                rt2800_init_bbp_3290(rt2x00dev);
                break;
        case RT3352:
@@ -126,7 +125,7 @@
                rt2800_init_bbp_3352(rt2x00dev);
                break;
        case RT3390:
-@@ -5182,6 +5212,76 @@ static void rt2800_init_rfcsr_3572(struc
+@@ -5182,6 +5213,76 @@ static void rt2800_init_rfcsr_3572(struc
        rt2800_normal_mode_setup_3xxx(rt2x00dev);
  }
  
@@ -203,7 +202,7 @@
  static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
  {
        rt2800_rf_init_calibration(rt2x00dev, 2);
-@@ -5410,6 +5510,9 @@ static void rt2800_init_rfcsr(struct rt2
+@@ -5410,6 +5511,9 @@ static void rt2800_init_rfcsr(struct rt2
        case RT3572:
                rt2800_init_rfcsr_3572(rt2x00dev);
                break;
@@ -213,7 +212,7 @@
        case RT5390:
                rt2800_init_rfcsr_5390(rt2x00dev);
                break;
-@@ -5621,6 +5724,12 @@ static int rt2800_validate_eeprom(struct
+@@ -5621,6 +5725,12 @@ static int rt2800_validate_eeprom(struct
                rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
                rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
                rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
@@ -226,11 +225,7 @@
        } else if (rt2x00_rt(rt2x00dev, RT2860) ||
                   rt2x00_rt(rt2x00dev, RT2872)) {
                /*
-@@ -5746,9 +5855,12 @@ static int rt2800_init_eeprom(struct rt2
-        */
-       if (rt2x00_rt(rt2x00dev, RT3290) ||
-           rt2x00_rt(rt2x00dev, RT3352) ||
-+          rt2x00_rt(rt2x00dev, RT5350) ||
+@@ -5749,6 +5859,8 @@ static int rt2800_init_eeprom(struct rt2
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);