diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
| commit | da032a4fe0515a97dbad6a0f18e20c058062d38c (patch) | |
| tree | 8d99340add217d9831810232b418635ccfaf8287 /package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch | |
| parent | 7467c1380b0aa1d287b9cecacab7351a65696da8 (diff) | |
| download | upstream-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.gz upstream-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.bz2 upstream-da032a4fe0515a97dbad6a0f18e20c058062d38c.zip | |
mac80211: merge a big batch of upstream changes/improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37918 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch index 5e187c7e77..325dba97c6 100644 --- a/package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch +++ b/package/kernel/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 -@@ -90,7 +90,7 @@ static void rt2800pci_mcu_status(struct +@@ -90,7 +90,7 @@ static void rt2800pci_mcu_status(struct rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); } @@ -9,7 +9,7 @@ { memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); return 0; -@@ -1097,8 +1097,9 @@ static int rt2800pci_read_eeprom(struct +@@ -1097,8 +1097,9 @@ static int rt2800pci_read_eeprom(struct { int retval; |