mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
703515f889
Includes the following changes:9edff13abdmac80211: disable potentially harmful PS software retry for A-MPDU sessions75216a76b0mac80211: backport upstream fix for CSA in IBSS mode368cc8ef47mac80211: update brcmfmac backporting brcmf_err cleanups66a63d25c4mac80211: fix build on linux 3.189eacb9d7fcrt2x00: mt7620: lots of improvementsfd94fa61a7mac80211: brcmfmac: update Raspberry Pi patches for linux 4.9649e766a64mac80211: update to wireless-testing 2017-01-3147540afa5dath9k: add a warning to the tx99 config optionb367eef21dmac80211: rt2x00: add support for external LNA on MT76209200e168f2mac80211: move (& update) upstream accepted brcmfmac patches Signed-off-by: Felix Fietkau <nbd@nbd.name>
34 lines
834 B
Diff
34 lines
834 B
Diff
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
|
|
@@ -26,6 +26,7 @@
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
+#include <linux/of.h>
|
|
|
|
#include "rt2x00.h"
|
|
#include "rt2x00lib.h"
|
|
@@ -34,11 +35,21 @@ static const char *
|
|
rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
|
|
+#ifdef CONFIG_OF
|
|
+ struct device_node *np;
|
|
+ const char *eep;
|
|
+#endif
|
|
|
|
if (pdata && pdata->eeprom_file_name)
|
|
return pdata->eeprom_file_name;
|
|
|
|
- return NULL
|
|
+#ifdef CONFIG_OF
|
|
+ np = rt2x00dev->dev->of_node;
|
|
+ if (np && of_property_read_string(np, "ralink,eeprom", &eep) == 0)
|
|
+ return eep;
|
|
+#endif
|
|
+
|
|
+ return NULL;
|
|
}
|
|
|
|
static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev)
|