summaryrefslogtreecommitdiff
path: root/package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-06-15 20:14:06 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-06-15 20:14:06 +0000
commit5ca4d24cd1043e142515ac66c44a26a2371978d3 (patch)
treef7411ae4df9fed440179fab0be52e2f1640544ed /package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
parentd3a7b5633c7c1ea142cb8c0872cab484ca385c92 (diff)
downloadmtk-20170518-5ca4d24cd1043e142515ac66c44a26a2371978d3.zip
mtk-20170518-5ca4d24cd1043e142515ac66c44a26a2371978d3.tar.gz
mtk-20170518-5ca4d24cd1043e142515ac66c44a26a2371978d3.tar.bz2
mac80211: update to wireless-testing 2013-06-13 + latest backport infrastructure
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36939
Diffstat (limited to 'package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch')
-rw-r--r--package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch b/package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
index dbfd80f..d5af4c9 100644
--- a/package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
+++ b/package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
@@ -12,14 +12,14 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -68,6 +68,7 @@ config RT2800PCI
+@@ -71,6 +71,7 @@ config RT2800PCI
+ select RT2X00_LIB_FIRMWARE
+ select RT2X00_LIB_EEPROM
select RT2X00_LIB_CRYPTO
- select CRC_CCITT
- select EEPROM_93CX6
+ select MTD if SOC_RT288X || SOC_RT305X
+ depends on CRC_CCITT
+ depends on EEPROM_93CX6
---help---
- This adds support for rt27xx/rt28xx/rt30xx wireless chipset family.
- Supported chips: RT2760, RT2790, RT2860, RT2880, RT2890, RT3052,
--- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c
+++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
@@ -30,12 +30,77 @@
@@ -99,4 +99,4 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+
ee_name = rt2x00dev->ops->lib->get_eeprom_file_name(rt2x00dev);
if (!ee_name) {
- ERROR(rt2x00dev,
+ rt2x00_err(rt2x00dev,