From accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 26 Apr 2013 10:52:03 +0000 Subject: mac80211: update to wireless-testing 2013-04-16 + backports Signed-off-by: Felix Fietkau SVN-Revision: 36448 --- package/mac80211/patches/605-rt2x00-pci-eeprom.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '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 33eb28f5f6..dd0596fd31 100644 --- a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch +++ b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch @@ -1,15 +1,15 @@ --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct - rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); +@@ -90,7 +90,7 @@ static void rt2800pci_mcu_status(struct + rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); } -static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) +static int rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev) { memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); - return 0; -@@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct + return -ENOMEM; +@@ -1099,8 +1099,9 @@ static int rt2800pci_read_eeprom(struct { int retval; @@ -23,7 +23,7 @@ else --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c -@@ -255,6 +255,7 @@ exit: +@@ -78,6 +78,7 @@ exit: int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops) { struct ieee80211_hw *hw; @@ -31,7 +31,7 @@ struct rt2x00_dev *rt2x00dev; int retval; u16 chip; -@@ -300,6 +301,12 @@ int rt2x00pci_probe(struct pci_dev *pci_ +@@ -123,6 +124,12 @@ int rt2x00pci_probe(struct pci_dev *pci_ rt2x00dev->irq = pci_dev->irq; rt2x00dev->name = pci_name(pci_dev); -- cgit v1.2.3