projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2014-01-23
[openwrt/svn-archive/archive.git]
/
package
/
kernel
/
mac80211
/
patches
/
610-rt2x00-fix-rt3352-ext-pa.patch
diff --git
a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
index edcfa6e43d445e2cde138c1587fb63d1a489cb21..83fbcd0fccf1c214c459dd6d92bb92f283a4ca44 100644
(file)
--- a/
package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
+++ b/
package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -317
8,11 +3178
,17 @@ static void rt2800_config_channel(struct
+@@ -317
6,11 +3176
,17 @@ static void rt2800_config_channel(struct
/*
* Change BBP settings
*/
/*
* Change BBP settings
*/
@@
-18,7
+18,7
@@
} else if (rt2x00_rt(rt2x00dev, RT3593)) {
if (rf->channel > 14) {
/* Disable CCK Packet detection on 5GHz */
} else if (rt2x00_rt(rt2x00dev, RT3593)) {
if (rf->channel > 14) {
/* Disable CCK Packet detection on 5GHz */
-@@ -319
6,14 +3202
,8 @@ static void rt2800_config_channel(struct
+@@ -319
4,14 +3200
,8 @@ static void rt2800_config_channel(struct
else
rt2800_bbp_write(rt2x00dev, 105, 0x34);
else
rt2800_bbp_write(rt2x00dev, 105, 0x34);
@@
-33,7
+33,7
@@
rt2800_bbp_write(rt2x00dev, 86, 0);
}
rt2800_bbp_write(rt2x00dev, 86, 0);
}
-@@ -612
7,6 +6127
,12 @@ static void rt2800_init_rfcsr_3290(struc
+@@ -612
5,6 +6125
,12 @@ static void rt2800_init_rfcsr_3290(struc
static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
{
static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
{
@@
-46,7
+46,7
@@
rt2800_rf_init_calibration(rt2x00dev, 30);
rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
rt2800_rf_init_calibration(rt2x00dev, 30);
rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
-@@ -616
2,15 +6168
,30 @@ static void rt2800_init_rfcsr_3352(struc
+@@ -616
0,15 +6166
,30 @@ static void rt2800_init_rfcsr_3352(struc
rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
@@
-80,7
+80,7
@@
rt2800_rfcsr_write(rt2x00dev, 43, 0xdb);
rt2800_rfcsr_write(rt2x00dev, 44, 0xdb);
rt2800_rfcsr_write(rt2x00dev, 45, 0xdb);
rt2800_rfcsr_write(rt2x00dev, 43, 0xdb);
rt2800_rfcsr_write(rt2x00dev, 44, 0xdb);
rt2800_rfcsr_write(rt2x00dev, 45, 0xdb);
-@@ -617
8,15 +6199
,20 @@ static void rt2800_init_rfcsr_3352(struc
+@@ -617
6,15 +6197
,20 @@ static void rt2800_init_rfcsr_3352(struc
rt2800_rfcsr_write(rt2x00dev, 47, 0x0d);
rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
rt2800_rfcsr_write(rt2x00dev, 47, 0x0d);
rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
@@
-110,7
+110,7
@@
rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
-@@ -70
46,6 +7072
,7 @@ static int rt2800_init_eeprom(struct rt2
+@@ -70
51,6 +7077
,7 @@ static int rt2800_init_eeprom(struct rt2
* RT53xx: defined in "EEPROM_CHIP_ID" field
*/
if (rt2x00_rt(rt2x00dev, RT3290) ||
* RT53xx: defined in "EEPROM_CHIP_ID" field
*/
if (rt2x00_rt(rt2x00dev, RT3290) ||
@@
-118,7
+118,7
@@
rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392))
rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392))
rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
-@@ -71
37,7 +7164
,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -71
42,7 +7169
,8 @@ static int rt2800_init_eeprom(struct rt2
/*
* Detect if this device has Bluetooth co-existence.
*/
/*
* Detect if this device has Bluetooth co-existence.
*/
@@
-128,7
+128,7
@@
__set_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags);
/*
__set_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags);
/*
-@@ -71
66,6 +7194
,22 @@ static int rt2800_init_eeprom(struct rt2
+@@ -71
71,6 +7199
,22 @@ static int rt2800_init_eeprom(struct rt2
EIRP_MAX_TX_POWER_LIMIT)
__set_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags);
EIRP_MAX_TX_POWER_LIMIT)
__set_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags);
@@
-153,7
+153,7
@@
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -2
301,6 +2301
,12 @@ struct mac_iveiv_entry {
+@@ -2
299,6 +2299
,12 @@ struct mac_iveiv_entry {
#define RFCSR36_RF_BS FIELD8(0x80)
/*
#define RFCSR36_RF_BS FIELD8(0x80)
/*
@@
-166,7
+166,7
@@
* RFCSR 38:
*/
#define RFCSR38_RX_LO1_EN FIELD8(0x20)
* RFCSR 38:
*/
#define RFCSR38_RX_LO1_EN FIELD8(0x20)
-@@ -231
2,6 +2318
,18 @@ struct mac_iveiv_entry {
+@@ -231
0,6 +2316
,18 @@ struct mac_iveiv_entry {
#define RFCSR39_RX_LO2_EN FIELD8(0x80)
/*
#define RFCSR39_RX_LO2_EN FIELD8(0x80)
/*
@@
-185,7
+185,7
@@
* RFCSR 49:
*/
#define RFCSR49_TX FIELD8(0x3f)
* RFCSR 49:
*/
#define RFCSR49_TX FIELD8(0x3f)
-@@ -232
4,6 +2342
,8 @@ struct mac_iveiv_entry {
+@@ -232
2,6 +2340
,8 @@ struct mac_iveiv_entry {
* RFCSR 50:
*/
#define RFCSR50_TX FIELD8(0x3f)
* RFCSR 50:
*/
#define RFCSR50_TX FIELD8(0x3f)
@@
-194,7
+194,7
@@
#define RFCSR50_EP FIELD8(0xc0)
/* bits for RT3593 */
#define RFCSR50_TX_LO1_EN FIELD8(0x20)
#define RFCSR50_EP FIELD8(0xc0)
/* bits for RT3593 */
#define RFCSR50_TX_LO1_EN FIELD8(0x20)
-@@ -24
71,6 +2491
,8 @@ enum rt2800_eeprom_word {
+@@ -24
69,6 +2489
,8 @@ enum rt2800_eeprom_word {
* INTERNAL_TX_ALC: 0: disable, 1: enable
* BT_COEXIST: 0: disable, 1: enable
* DAC_TEST: 0: disable, 1: enable
* INTERNAL_TX_ALC: 0: disable, 1: enable
* BT_COEXIST: 0: disable, 1: enable
* DAC_TEST: 0: disable, 1: enable
@@
-203,7
+203,7
@@
*/
#define EEPROM_NIC_CONF1_HW_RADIO FIELD16(0x0001)
#define EEPROM_NIC_CONF1_EXTERNAL_TX_ALC FIELD16(0x0002)
*/
#define EEPROM_NIC_CONF1_HW_RADIO FIELD16(0x0001)
#define EEPROM_NIC_CONF1_EXTERNAL_TX_ALC FIELD16(0x0002)
-@@ -248
7,6 +2509
,8 @@ enum rt2800_eeprom_word {
+@@ -248
5,6 +2507
,8 @@ enum rt2800_eeprom_word {
#define EEPROM_NIC_CONF1_INTERNAL_TX_ALC FIELD16(0x2000)
#define EEPROM_NIC_CONF1_BT_COEXIST FIELD16(0x4000)
#define EEPROM_NIC_CONF1_DAC_TEST FIELD16(0x8000)
#define EEPROM_NIC_CONF1_INTERNAL_TX_ALC FIELD16(0x2000)
#define EEPROM_NIC_CONF1_BT_COEXIST FIELD16(0x4000)
#define EEPROM_NIC_CONF1_DAC_TEST FIELD16(0x8000)
@@
-214,7
+214,7
@@
* EEPROM frequency
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
* EEPROM frequency
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -71
6,6 +716
,8 @@ enum rt2x00_capability_flags {
+@@ -71
4,6 +714
,8 @@ enum rt2x00_capability_flags {
CAPABILITY_DOUBLE_ANTENNA,
CAPABILITY_BT_COEXIST,
CAPABILITY_VCO_RECALIBRATION,
CAPABILITY_DOUBLE_ANTENNA,
CAPABILITY_BT_COEXIST,
CAPABILITY_VCO_RECALIBRATION,