summaryrefslogtreecommitdiff
path: root/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-01-30 13:21:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-01-30 13:21:36 +0000
commiteb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74 (patch)
treef384015bf67b4da2efefd6d04a7f620dfe4504b1 /package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
parent2725913d2acca4774c41c7de0d8f4940615a3f1d (diff)
downloadmtk-20170518-eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74.zip
mtk-20170518-eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74.tar.gz
mtk-20170518-eb7a1ba94b7221358ab5f207d8af8dc8b7a2cf74.tar.bz2
mac80211: update to wireless-testing 2014-01-23
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39427
Diffstat (limited to 'package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch')
-rw-r--r--package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch17
1 files changed, 3 insertions, 14 deletions
diff --git a/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch b/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
index 7d999f9..75f0415 100644
--- a/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
+++ b/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
@@ -22,7 +22,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
Supported chips: RT2880, RT3050, RT3052, RT3350, RT3352.
--- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c
+++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-@@ -26,17 +26,72 @@
+@@ -26,11 +26,66 @@
#include <linux/kernel.h>
#include <linux/module.h>
@@ -89,19 +89,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
static const char *
rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
{
- struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
- struct device_node *np;
-- char *eep;
-+ const char *eep;
-
- if (pdata && pdata->eeprom_file_name)
- return pdata->eeprom_file_name;
-@@ -53,9 +108,12 @@ rt2x00lib_get_eeprom_file_name(struct rt
- static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev)
- {
- const struct firmware *ee;
-- char *ee_name;
-+ const char *ee_name;
+@@ -58,6 +113,9 @@ static int rt2x00lib_request_eeprom_file
+ const char *ee_name;
int retval;
+ if (!rt2800lib_read_eeprom_mtd(rt2x00dev))