diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-09-08 11:10:54 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-08 11:10:54 +0000 |
| commit | b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b (patch) | |
| tree | 8c49adee2d02a47208f7d920f1fff9941c0f3f50 /package/mac80211/patches/605-rt2x00-pci-eeprom.patch | |
| parent | 2daf0ae2046f31ef96f2a413955032e0cded60f1 (diff) | |
| download | master-187ad058-b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b.tar.gz master-187ad058-b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b.tar.bz2 master-187ad058-b4f512b67c2ed5e8d3a8cedefb76193e3e699e1b.zip | |
mac80211: update to 2012-09-07, adds ath9k beacon fixes, mesh/adhoc fixes, and more
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33331 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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch index c2b46fd966..fbc86199a4 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 -@@ -84,7 +84,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,14 +9,14 @@ { memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); } -@@ -974,8 +974,9 @@ static int rt2800pci_validate_eeprom(str - /* - * Read EEPROM into buffer - */ +@@ -976,8 +976,9 @@ static irqreturn_t rt2800pci_interrupt(i + */ + static void rt2800pci_read_eeprom(struct rt2x00_dev *rt2x00dev) + { - if (rt2x00_is_soc(rt2x00dev)) - rt2800pci_read_eeprom_soc(rt2x00dev); + if (rt2x00_is_soc(rt2x00dev) || -+ test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags)) ++ test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags)) + rt2800pci_read_eeprom_file(rt2x00dev); else if (rt2800pci_efuse_detect(rt2x00dev)) rt2800pci_read_eeprom_efuse(rt2x00dev); |