summaryrefslogtreecommitdiff
path: root/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-09-27 20:51:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-09-27 20:51:43 +0000
commit8be721208dad06c6a3119dee2db81c385a91a336 (patch)
tree70eddd3a592f75ebfb105dc619735d0c5178c471 /package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
parent54a18b3fe80d6cfe06acda47c7d4d82c0d0e5688 (diff)
downloadmtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.zip
mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.tar.gz
mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.tar.bz2
mac80211: update to wireless-testing 2014-09-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42683
Diffstat (limited to 'package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch')
-rw-r--r--package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
index e5ba10e..994433c 100644
--- a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
+++ b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
@@ -1,6 +1,6 @@
--- a/.local-symbols
+++ b/.local-symbols
-@@ -281,6 +281,7 @@ RT2X00_LIB_FIRMWARE=
+@@ -284,6 +284,7 @@ RT2X00_LIB_FIRMWARE=
RT2X00_LIB_CRYPTO=
RT2X00_LIB_LEDS=
RT2X00_LIB_DEBUGFS=
@@ -105,15 +105,15 @@
.drv_init_registers = rt2800mmio_init_registers,
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -694,6 +694,7 @@ enum rt2x00_capability_flags {
- REQUIRE_SW_SEQNO,
+@@ -695,6 +695,7 @@ enum rt2x00_capability_flags {
REQUIRE_HT_TX_DESC,
REQUIRE_PS_AUTOWAKE,
+ REQUIRE_DELAYED_RFKILL,
+ REQUIRE_EEPROM_FILE,
/*
* Capabilities
-@@ -963,6 +964,11 @@ struct rt2x00_dev {
+@@ -964,6 +965,11 @@ struct rt2x00_dev {
const struct firmware *fw;
/*
@@ -127,7 +127,7 @@
DECLARE_KFIFO_PTR(txstatus_fifo, u32);
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -1327,6 +1327,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+@@ -1334,6 +1334,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
@@ -138,10 +138,10 @@
/*
* Let the driver probe the device to detect the capabilities.
*/
-@@ -1457,6 +1461,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
+@@ -1474,6 +1478,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
+ * Free the driver data.
*/
- if (rt2x00dev->drv_data)
- kfree(rt2x00dev->drv_data);
+ kfree(rt2x00dev->drv_data);
+
+ /*
+ * Free EEPROM image.