diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-28 12:37:09 +0000 |
| commit | d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b (patch) | |
| tree | 55111555c00d21d4857262bd9ca3ee0bc2bcf222 /package/mac80211/patches/605-rt2x00-pci-eeprom.patch | |
| parent | acd03cf8d8c3a047108b7983944b0c8d0228f812 (diff) | |
| download | upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.gz upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.tar.bz2 upstream-d520c048d8eda9083b3fffb4e4e0a82a8a8b0c6b.zip | |
mac80211: update to 2013-02-22 from trunk + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36470 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/605-rt2x00-pci-eeprom.patch')
| -rw-r--r-- | package/mac80211/patches/605-rt2x00-pci-eeprom.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch index fbc86199a4..33eb28f5f6 100644 --- a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch +++ b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch @@ -4,22 +4,22 @@ rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); } --static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) -+static void rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev) +-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); - } -@@ -976,8 +976,9 @@ static irqreturn_t rt2800pci_interrupt(i - */ - static void rt2800pci_read_eeprom(struct rt2x00_dev *rt2x00dev) + return 0; +@@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct { + int retval; + - if (rt2x00_is_soc(rt2x00dev)) -- rt2800pci_read_eeprom_soc(rt2x00dev); +- retval = rt2800pci_read_eeprom_soc(rt2x00dev); + if (rt2x00_is_soc(rt2x00dev) || + test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags)) -+ rt2800pci_read_eeprom_file(rt2x00dev); ++ retval = rt2800pci_read_eeprom_file(rt2x00dev); else if (rt2800pci_efuse_detect(rt2x00dev)) - rt2800pci_read_eeprom_efuse(rt2x00dev); + retval = rt2800pci_read_eeprom_efuse(rt2x00dev); else --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c |