diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-09-28 18:28:54 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-28 18:28:54 +0000 |
| commit | 6d37c9e99af7dfb7a64de77e504b68293f96497a (patch) | |
| tree | ed32fe75fe6dc61a54eda979b962069cd8b3e3dd /package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | |
| parent | 0a0e6549630008ef0c1d27cb20e632046364fd59 (diff) | |
| download | upstream-6d37c9e99af7dfb7a64de77e504b68293f96497a.tar.gz upstream-6d37c9e99af7dfb7a64de77e504b68293f96497a.tar.bz2 upstream-6d37c9e99af7dfb7a64de77e504b68293f96497a.zip | |
mac80211: fix beacon IE power constraint handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33583 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch')
| -rw-r--r-- | package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch index cb0bc02e8c..4f35ae899f 100644 --- a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch +++ b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch @@ -186,7 +186,7 @@ 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,20 +89,10 @@ static void rt2800pci_mcu_status(struct rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); } @@ -198,12 +198,12 @@ - memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE); - - iounmap(base_addr); --} ++ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); + } -#else -static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) -{ -+ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); - } +-} -#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */ #ifdef CONFIG_PCI |