aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-07 22:05:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-04-07 22:05:36 +0000
commitb5a27f260bb5355e9d7f1bb91849913cff6ce84e (patch)
tree704016795d359b530a350a90ae42d2622d74f237 /package/mac80211/patches/605-rt2x00-pci-eeprom.patch
parent97635d7a8e02a2fd5cdd41868e4d56d3ef62d8bb (diff)
downloadupstream-b5a27f260bb5355e9d7f1bb91849913cff6ce84e.tar.gz
upstream-b5a27f260bb5355e9d7f1bb91849913cff6ce84e.tar.bz2
upstream-b5a27f260bb5355e9d7f1bb91849913cff6ce84e.zip
mac80211: merge an idle handling fix (fixes ath9k_htc client mode), refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36265
Diffstat (limited to 'package/mac80211/patches/605-rt2x00-pci-eeprom.patch')
-rw-r--r--package/mac80211/patches/605-rt2x00-pci-eeprom.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
index 25b21cecea..33eb28f5f6 100644
--- 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
-@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct
+@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct
rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
}
@@ -9,7 +9,7 @@
{
memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
return 0;
-@@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct
+@@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct
{
int retval;