mac80211: merge a big batch of upstream changes/improvements

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37918

1 files changed, 14 insertions, 14 deletions

diff --git a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
index 0ee98df5db..223d46a8e3 100644
--- a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
+++ b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
@@ -52,7 +52,7 @@
  		rt2800_bbp_read(rt2x00dev, 49, &bbp);
  		rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0);
  		rt2800_bbp_write(rt2x00dev, 49, bbp);
-@@ -4259,6 +4271,7 @@ void rt2800_vco_calibration(struct rt2x0
+@@ -4266,6 +4278,7 @@ void rt2800_vco_calibration(struct rt2x0
  		break;
  	case RF3053:
  	case RF3290:
@@ -60,7 +60,7 @@
  	case RF5360:
  	case RF5370:
  	case RF5372:
-@@ -4630,6 +4643,8 @@ static int rt2800_init_registers(struct
+@@ -4637,6 +4650,8 @@ static int rt2800_init_registers(struct 
  		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
  		rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
  		rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
@@ -69,7 +69,7 @@
  	} else {
  		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);
  		rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
-@@ -5271,9 +5286,13 @@ static void rt2800_init_bbp_3352(struct
+@@ -5278,9 +5293,13 @@ static void rt2800_init_bbp_3352(struct 
  
  	rt2800_bbp_write(rt2x00dev, 82, 0x62);
  
@@ -86,7 +86,7 @@
  
  	rt2800_bbp_write(rt2x00dev, 86, 0x38);
  
-@@ -5287,9 +5306,13 @@ static void rt2800_init_bbp_3352(struct
+@@ -5294,9 +5313,13 @@ static void rt2800_init_bbp_3352(struct 
  
  	rt2800_bbp_write(rt2x00dev, 104, 0x92);
  
@@ -103,7 +103,7 @@
  
  	rt2800_bbp_write(rt2x00dev, 120, 0x50);
  
-@@ -5314,6 +5337,13 @@ static void rt2800_init_bbp_3352(struct
+@@ -5321,6 +5344,13 @@ static void rt2800_init_bbp_3352(struct 
  	rt2800_bbp_write(rt2x00dev, 143, 0xa2);
  
  	rt2800_bbp_write(rt2x00dev, 148, 0xc8);
@@ -117,7 +117,7 @@
  }
  
  static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev)
-@@ -5614,6 +5644,7 @@ static void rt2800_init_bbp(struct rt2x0
+@@ -5621,6 +5651,7 @@ static void rt2800_init_bbp(struct rt2x0
  		rt2800_init_bbp_3290(rt2x00dev);
  		break;
  	case RT3352:
@@ -125,7 +125,7 @@
  		rt2800_init_bbp_3352(rt2x00dev);
  		break;
  	case RT3390:
-@@ -6424,6 +6455,76 @@ static void rt2800_init_rfcsr_3593(struc
+@@ -6431,6 +6462,76 @@ static void rt2800_init_rfcsr_3593(struc
  	/* TODO: enable stream mode support */
  }
  
@@ -202,7 +202,7 @@
  static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
  {
  	rt2800_rf_init_calibration(rt2x00dev, 2);
-@@ -6655,6 +6756,9 @@ static void rt2800_init_rfcsr(struct rt2
+@@ -6662,6 +6763,9 @@ static void rt2800_init_rfcsr(struct rt2
  	case RT3593:
  		rt2800_init_rfcsr_3593(rt2x00dev);
  		break;
@@ -212,7 +212,7 @@
  	case RT5390:
  		rt2800_init_rfcsr_5390(rt2x00dev);
  		break;
-@@ -6894,6 +6998,12 @@ static int rt2800_validate_eeprom(struct
+@@ -6901,6 +7005,12 @@ static int rt2800_validate_eeprom(struct
  		rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
  		rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
  		rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
@@ -225,7 +225,7 @@
  	} else if (rt2x00_rt(rt2x00dev, RT2860) ||
  		   rt2x00_rt(rt2x00dev, RT2872)) {
  		/*
-@@ -7027,6 +7137,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7034,6 +7144,8 @@ static int rt2800_init_eeprom(struct rt2
  	    rt2x00_rt(rt2x00dev, RT5390) ||
  	    rt2x00_rt(rt2x00dev, RT5392))
  		rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
@@ -234,7 +234,7 @@
  	else
  		rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
  
-@@ -7044,6 +7156,7 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7051,6 +7163,7 @@ static int rt2800_init_eeprom(struct rt2
  	case RF3290:
  	case RF3320:
  	case RF3322:
@@ -242,7 +242,7 @@
  	case RF5360:
  	case RF5370:
  	case RF5372:
-@@ -7610,7 +7723,8 @@ static int rt2800_probe_hw_mode(struct r
+@@ -7617,7 +7730,8 @@ static int rt2800_probe_hw_mode(struct r
  		   rt2x00_rf(rt2x00dev, RF5392)) {
  		spec->num_channels = 14;
  		spec->channels = rf_vals_3x;
@@ -252,7 +252,7 @@
  		spec->num_channels = 14;
  		if (spec->clk_is_20mhz)
  			spec->channels = rf_vals_xtal20mhz_3x;
-@@ -7735,6 +7849,7 @@ static int rt2800_probe_hw_mode(struct r
+@@ -7742,6 +7856,7 @@ static int rt2800_probe_hw_mode(struct r
  	case RF3052:
  	case RF3053:
  	case RF3290:
@@ -260,7 +260,7 @@
  	case RF5360:
  	case RF5370:
  	case RF5372:
-@@ -7773,6 +7888,7 @@ static int rt2800_probe_rt(struct rt2x00
+@@ -7780,6 +7895,7 @@ static int rt2800_probe_rt(struct rt2x00
  	case RT3390:
  	case RT3572:
  	case RT3593: