projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2013-06-13 + latest backport infrastructure
[openwrt/svn-archive/archive.git]
/
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 fbc86199a4b2e2e556f87f8dc42f08e31e33c0fd..d37f3acc28c936e054e19dd53ff520c6e18bc066 100644
(file)
--- a/
package/mac80211/patches/605-rt2x00-pci-eeprom.patch
+++ b/
package/mac80211/patches/605-rt2x00-pci-eeprom.patch
@@
-1,29
+1,29
@@
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -
89,7 +89
,7 @@ static void rt2800pci_mcu_status(struct
- rt2x00
pci
_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
+@@ -
90,7 +90
,7 @@ static void rt2800pci_mcu_status(struct
+ rt2x00
mmio
_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);
{
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;
+@@ -1092,8 +1092,9 @@ static int rt2800pci_read_eeprom(struct
{
{
+ int retval;
+
- if (rt2x00_is_soc(rt2x00dev))
- if (rt2x00_is_soc(rt2x00dev))
-- rt2800pci_read_eeprom_soc(rt2x00dev);
+- r
etval = r
t2800pci_read_eeprom_soc(rt2x00dev);
+ if (rt2x00_is_soc(rt2x00dev) ||
+ test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
+ if (rt2x00_is_soc(rt2x00dev) ||
+ test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
-+ rt2800pci_read_eeprom_file(rt2x00dev);
++ r
etval = r
t2800pci_read_eeprom_file(rt2x00dev);
else if (rt2800pci_efuse_detect(rt2x00dev))
else if (rt2800pci_efuse_detect(rt2x00dev))
- rt2800pci_read_eeprom_efuse(rt2x00dev);
+ r
etval = r
t2800pci_read_eeprom_efuse(rt2x00dev);
else
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
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;
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;
struct rt2x00_dev *rt2x00dev;
int retval;
u16 chip;
-@@ -
300,6 +301
,12 @@ int rt2x00pci_probe(struct pci_dev *pci_
+@@ -
125,6 +126
,12 @@ int rt2x00pci_probe(struct pci_dev *pci_
rt2x00dev->irq = pci_dev->irq;
rt2x00dev->name = pci_name(pci_dev);
rt2x00dev->irq = pci_dev->irq;
rt2x00dev->name = pci_name(pci_dev);