diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-12 08:19:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-12 08:19:04 +0000 |
| commit | d1af787dc992741bffa1a1ce0b4ca7eacb1f7227 (patch) | |
| tree | b4d150683b180b04da569f049a53d592956d705b /package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch | |
| parent | 700de21fec69cc8b11374be00d04660ffbd48943 (diff) | |
| download | upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.gz upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.tar.bz2 upstream-d1af787dc992741bffa1a1ce0b4ca7eacb1f7227.zip | |
mac80211: backport latest version from trunk (as of r37265)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@37266 3c298f89-4303-0410-b956-a3cf2f4a3e73
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-.patch | 12 |
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 c7d40ef7c6..d5af4c9ae2 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 -@@ -64,6 +64,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, |