projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to 2012-09-07, adds ath9k beacon fixes, mesh/adhoc fixes, and more
[openwrt.git]
/
package
/
mac80211
/
patches
/
605-rt2x00-pci-eeprom.patch
diff --git
a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
index
c2b46fd
..
fbc8619
100644
(file)
--- a/
package/mac80211/patches/605-rt2x00-pci-eeprom.patch
+++ b/
package/mac80211/patches/605-rt2x00-pci-eeprom.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -8
4,7 +84
,7 @@ static void rt2800pci_mcu_status(struct
+@@ -8
9,7 +89
,7 @@ static void rt2800pci_mcu_status(struct
rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
}
rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
}
@@
-9,14
+9,14
@@
{
memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
}
{
memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
}
-@@ -97
4,8 +974,9 @@ static int rt2800pci_validate_eeprom(str
- /*
- * Read EEPROM into buffer
- */
+@@ -97
6,8 +976,9 @@ static irqreturn_t rt2800pci_interrupt(i
+ */
+ static void rt2800pci_read_eeprom(struct rt2x00_dev *rt2x00dev)
+ {
- if (rt2x00_is_soc(rt2x00dev))
- rt2800pci_read_eeprom_soc(rt2x00dev);
+ if (rt2x00_is_soc(rt2x00dev) ||
- if (rt2x00_is_soc(rt2x00dev))
- rt2800pci_read_eeprom_soc(rt2x00dev);
+ if (rt2x00_is_soc(rt2x00dev) ||
-+
test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
++ test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
+ rt2800pci_read_eeprom_file(rt2x00dev);
else if (rt2800pci_efuse_detect(rt2x00dev))
rt2800pci_read_eeprom_efuse(rt2x00dev);
+ rt2800pci_read_eeprom_file(rt2x00dev);
else if (rt2800pci_efuse_detect(rt2x00dev))
rt2800pci_read_eeprom_efuse(rt2x00dev);