diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:45:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:45:28 +0000 |
| commit | 5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4 (patch) | |
| tree | 3b9cc236acb707d3a563f84f91f5d7fc6c183bd4 /package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | |
| parent | 4834d09a3f91622bb78e2163181a976933a96c43 (diff) | |
| download | upstream-5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4.tar.gz upstream-5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4.tar.bz2 upstream-5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4.zip | |
mac80211: update to 2013-01-07, add several ath9k stability fixes
SVN-Revision: 35063
Diffstat (limited to 'package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch')
| -rw-r--r-- | package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch index 9897291322..ba82930676 100644 --- a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch +++ b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch @@ -186,29 +186,34 @@ obj-$(CONFIG_RT2X00_LIB_PCI) += rt2x00pci.o --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -89,20 +89,10 @@ static void rt2800pci_mcu_status(struct +@@ -89,25 +89,11 @@ static void rt2800pci_mcu_status(struct rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); } -#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X) - static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) + static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) { - void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE); - +- if (!base_addr) +- return -ENOMEM; +- - memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE); - - iounmap(base_addr); + memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); + return 0; } -#else --static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) +-static inline int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) -{ +- return -ENOMEM; -} -#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */ #ifdef CONFIG_PCI static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom) -@@ -322,6 +312,20 @@ static int rt2800pci_write_firmware(stru +@@ -331,6 +317,20 @@ static int rt2800pci_write_firmware(stru } /* @@ -229,7 +234,7 @@ * Initialization functions. */ static bool rt2800pci_get_entry_state(struct queue_entry *entry) -@@ -1033,6 +1037,7 @@ static const struct rt2x00lib_ops rt2800 +@@ -1046,6 +1046,7 @@ static const struct rt2x00lib_ops rt2800 .get_firmware_name = rt2800pci_get_firmware_name, .check_firmware = rt2800_check_firmware, .load_firmware = rt2800_load_firmware, |