mac80211: refresh patches

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

git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@43054 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2014-10-25 09:31:01 +00:00
parent 66a76be5c1
commit fdbd75e036
5 changed files with 50 additions and 56 deletions

View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1265,7 +1265,7 @@ static inline void rt2x00lib_set_if_comb
@@ -1276,7 +1276,7 @@ static inline void rt2x00lib_set_if_comb
*/
if_limit = &rt2x00dev->if_limits_ap;
if_limit->max = rt2x00dev->ops->max_ap_intf;

View File

@ -1,8 +1,6 @@
Index: compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800.h
===================================================================
--- compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800.h 2014-08-31 05:04:55.600142409 +0200
+++ compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800.h 2014-08-31 05:11:02.068145882 +0200
@@ -2346,6 +2346,8 @@
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -2319,6 +2319,8 @@ struct mac_iveiv_entry {
#define RFCSR30_RX_H20M FIELD8(0x04)
#define RFCSR30_RX_VCM FIELD8(0x18)
#define RFCSR30_RF_CALIBRATION FIELD8(0x80)
@ -11,11 +9,9 @@ Index: compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800.h
/*
* RFCSR 31:
Index: compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800lib.c
===================================================================
--- compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800lib.c 2014-08-31 05:04:55.604142409 +0200
+++ compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800lib.c 2014-08-31 05:15:02.176148157 +0200
@@ -3928,8 +3928,13 @@
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -3549,8 +3549,13 @@ static void rt2800_config_channel(struct
rt2x00_rf(rt2x00dev, RF5390) ||
rt2x00_rf(rt2x00dev, RF5392)) {
rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);

View File

@ -1,5 +1,5 @@
--- a/drivers/net/wireless/rt2x00/rt2800.h 2014-06-30 01:05:26.000000000 +0300
+++ b/drivers/net/wireless/rt2x00/rt2800.h 2014-06-30 01:23:42.000000000 +0300
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -79,6 +79,7 @@
#define RF5372 0x5372
#define RF5390 0x5390
@ -62,8 +62,8 @@
/* TX_PWR_CFG_7 */
#define TX_PWR_CFG_7 0x13d4
#define TX_PWR_CFG_7_OFDM54_CH0 FIELD32(0x0000000f)
--- a/drivers/net/wireless/rt2x00/rt2800lib.c 2014-06-30 01:05:26.000000000 +0300
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c 2014-06-30 17:31:35.000000000 +0300
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -61,6 +61,8 @@
rt2800_regbusy_read((__dev), BBP_CSR_CFG, BBP_CSR_CFG_BUSY, (__reg))
#define WAIT_FOR_RFCSR(__dev, __reg) \
@ -539,7 +539,7 @@
default:
rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
}
@@ -3631,7 +4010,7 @@ static void rt2800_config_channel(struct
@@ -3636,7 +4015,7 @@ static void rt2800_config_channel(struct
else if (rt2x00_rt(rt2x00dev, RT3593) ||
rt2x00_rt(rt2x00dev, RT3883))
rt2800_bbp_write(rt2x00dev, 82, 0x82);
@ -548,7 +548,7 @@
rt2800_bbp_write(rt2x00dev, 82, 0xf2);
if (rt2x00_rt(rt2x00dev, RT3593) ||
@@ -3653,7 +4032,7 @@ static void rt2800_config_channel(struct
@@ -3658,7 +4037,7 @@ static void rt2800_config_channel(struct
if (rt2x00_rt(rt2x00dev, RT3572))
rt2800_rfcsr_write(rt2x00dev, 8, 0);
@ -557,7 +557,7 @@
switch (rt2x00dev->default_ant.tx_chain_num) {
case 3:
@@ -3702,6 +4081,7 @@ static void rt2800_config_channel(struct
@@ -3707,6 +4086,7 @@ static void rt2800_config_channel(struct
rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);
rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1);
@ -565,7 +565,7 @@
rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
@@ -4710,6 +5090,14 @@ void rt2800_vco_calibration(struct rt2x0
@@ -4715,6 +5095,14 @@ void rt2800_vco_calibration(struct rt2x0
rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
break;
@ -580,7 +580,7 @@
default:
return;
}
@@ -5110,9 +5498,42 @@ static int rt2800_init_registers(struct
@@ -5115,9 +5503,42 @@ static int rt2800_init_registers(struct
} else if (rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392) ||
rt2x00_rt(rt2x00dev, RT5592)) {
@ -626,7 +626,7 @@
} else if (rt2x00_rt(rt2x00dev, RT5350)) {
rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
} else {
@@ -6144,6 +6565,225 @@ static void rt2800_init_bbp_5592(struct
@@ -6149,6 +6570,225 @@ static void rt2800_init_bbp_5592(struct
rt2800_bbp_write(rt2x00dev, 103, 0xc0);
}
@ -852,7 +852,7 @@
static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
{
unsigned int i;
@@ -6186,7 +6826,10 @@ static void rt2800_init_bbp(struct rt2x0
@@ -6191,7 +6831,10 @@ static void rt2800_init_bbp(struct rt2x0
return;
case RT5390:
case RT5392:
@ -864,7 +864,7 @@
break;
case RT5592:
rt2800_init_bbp_5592(rt2x00dev);
@@ -7400,6 +8043,295 @@ static void rt2800_init_rfcsr_5592(struc
@@ -7405,6 +8048,295 @@ static void rt2800_init_rfcsr_5592(struc
rt2800_led_open_drain_enable(rt2x00dev);
}
@ -1160,7 +1160,7 @@
static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
{
if (rt2800_is_305x_soc(rt2x00dev)) {
@@ -7435,7 +8367,10 @@ static void rt2800_init_rfcsr(struct rt2
@@ -7440,7 +8372,10 @@ static void rt2800_init_rfcsr(struct rt2
rt2800_init_rfcsr_5350(rt2x00dev);
break;
case RT5390:
@ -1172,7 +1172,7 @@
break;
case RT5392:
rt2800_init_rfcsr_5392(rt2x00dev);
@@ -7866,6 +8801,7 @@ static int rt2800_init_eeprom(struct rt2
@@ -7871,6 +8806,7 @@ static int rt2800_init_eeprom(struct rt2
case RF5390:
case RF5392:
case RF5592:
@ -1180,7 +1180,7 @@
break;
default:
rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
@@ -8431,6 +9367,7 @@ static int rt2800_probe_hw_mode(struct r
@@ -8436,6 +9372,7 @@ static int rt2800_probe_hw_mode(struct r
case RF5372:
case RF5390:
case RF5392:
@ -1188,7 +1188,7 @@
spec->num_channels = 14;
if (spec->clk_is_20mhz)
spec->channels = rf_vals_xtal20mhz_3x;
@@ -8570,6 +9507,7 @@ static int rt2800_probe_hw_mode(struct r
@@ -8575,6 +9512,7 @@ static int rt2800_probe_hw_mode(struct r
case RF5372:
case RF5390:
case RF5392:

View File

@ -1,6 +1,5 @@
diff -u -N -r compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800.h compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800.h
--- compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800.h 2014-10-10 14:53:56.000000000 +0200
+++ compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800.h 2014-10-10 15:09:36.000000000 +0200
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -53,6 +53,7 @@
* RF5592 2.4G/5G 2T2R
* RF3070 2.4G 1T1R
@ -17,7 +16,7 @@ diff -u -N -r compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800
#define RF5370 0x5370
#define RF5372 0x5372
#define RF5390 0x5390
@@ -2207,7 +2209,7 @@
@@ -2207,7 +2209,7 @@ struct mac_iveiv_entry {
/* Bits [7-4] for RF3320 (RT3370/RT3390), on other chipsets reserved */
#define RFCSR3_PA1_BIAS_CCK FIELD8(0x70)
#define RFCSR3_PA2_CASCODE_BIAS_CCKK FIELD8(0x80)
@ -26,10 +25,9 @@ diff -u -N -r compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800
#define RFCSR3_VCOCAL_EN FIELD8(0x80)
/* Bits for RF3050 */
#define RFCSR3_BIT1 FIELD8(0x02)
diff -u -N -r compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800lib.c compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800lib.c
--- compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800lib.c 2014-10-10 14:53:56.000000000 +0200
+++ compat-wireless-2014-05-22/drivers/net/wireless/rt2x00/rt2800lib.c 2014-10-10 15:10:43.000000000 +0200
@@ -3902,6 +3902,7 @@
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -3902,6 +3902,7 @@ static void rt2800_config_channel(struct
case RF3070:
case RF5350:
case RF5360:
@ -37,7 +35,7 @@ diff -u -N -r compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800
case RF5370:
case RF5372:
case RF5390:
@@ -3923,6 +3924,7 @@
@@ -3923,6 +3924,7 @@ static void rt2800_config_channel(struct
rt2x00_rf(rt2x00dev, RF3322) ||
rt2x00_rf(rt2x00dev, RF5350) ||
rt2x00_rf(rt2x00dev, RF5360) ||
@ -45,7 +43,7 @@ diff -u -N -r compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800
rt2x00_rf(rt2x00dev, RF5370) ||
rt2x00_rf(rt2x00dev, RF5372) ||
rt2x00_rf(rt2x00dev, RF5390) ||
@@ -5087,6 +5089,7 @@
@@ -5087,6 +5089,7 @@ void rt2800_vco_calibration(struct rt2x0
case RF3853:
case RF5350:
case RF5360:
@ -53,7 +51,7 @@ diff -u -N -r compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800
case RF5370:
case RF5372:
case RF5390:
@@ -8801,6 +8804,7 @@
@@ -8801,6 +8804,7 @@ static int rt2800_init_eeprom(struct rt2
case RF3853:
case RF5350:
case RF5360:
@ -61,7 +59,7 @@ diff -u -N -r compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800
case RF5370:
case RF5372:
case RF5390:
@@ -9368,6 +9372,7 @@
@@ -9368,6 +9372,7 @@ static int rt2800_probe_hw_mode(struct r
case RF3322:
case RF5350:
case RF5360:
@ -69,7 +67,7 @@ diff -u -N -r compat-wireless-2014-05-22.orig/drivers/net/wireless/rt2x00/rt2800
case RF5370:
case RF5372:
case RF5390:
@@ -9508,6 +9513,7 @@
@@ -9508,6 +9513,7 @@ static int rt2800_probe_hw_mode(struct r
case RF3853:
case RF5350:
case RF5360: