summaryrefslogtreecommitdiff
path: root/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-09 12:45:28 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-01-09 12:45:28 +0000
commit5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4 (patch)
tree3b9cc236acb707d3a563f84f91f5d7fc6c183bd4 /package/mac80211/patches/605-rt2x00-pci-eeprom.patch
parent4834d09a3f91622bb78e2163181a976933a96c43 (diff)
downloadmtk-20170518-5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4.zip
mtk-20170518-5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4.tar.gz
mtk-20170518-5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4.tar.bz2
mac80211: update to 2013-01-07, add several ath9k stability fixes
SVN-Revision: 35063
Diffstat (limited to 'package/mac80211/patches/605-rt2x00-pci-eeprom.patch')
-rw-r--r--package/mac80211/patches/605-rt2x00-pci-eeprom.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
index fbc8619..8001789 100644
--- a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
+++ b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
@@ -4,22 +4,22 @@
rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
}
--static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
+-static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
+static void rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev)
{
memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
- }
-@@ -976,8 +976,9 @@ static irqreturn_t rt2800pci_interrupt(i
- */
- static void rt2800pci_read_eeprom(struct rt2x00_dev *rt2x00dev)
+ return 0;
+@@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct
{
+ int retval;
+
- if (rt2x00_is_soc(rt2x00dev))
-- rt2800pci_read_eeprom_soc(rt2x00dev);
+- retval = rt2800pci_read_eeprom_soc(rt2x00dev);
+ if (rt2x00_is_soc(rt2x00dev) ||
+ test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
+ rt2800pci_read_eeprom_file(rt2x00dev);
else if (rt2800pci_efuse_detect(rt2x00dev))
- rt2800pci_read_eeprom_efuse(rt2x00dev);
+ retval = rt2800pci_read_eeprom_efuse(rt2x00dev);
else
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c