X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F605-rt2x00-pci-eeprom.patch;h=fbc86199a4b2e2e556f87f8dc42f08e31e33c0fd;hb=adcd2dbc79b5a648d7b6c328a94f731c479c79b5;hp=c2e574d058ad0f9596d3ddd303cb66fe749a6e87;hpb=2c1120a3b32ae80e786670900f6bee9182816a4b;p=openwrt.git

diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
index c2e574d058..fbc86199a4 100644
--- a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
+++ b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
@@ -1,8 +1,6 @@
-Index: compat-wireless-2011-11-04/drivers/net/wireless/rt2x00/rt2800pci.c
-===================================================================
---- compat-wireless-2011-11-04.orig/drivers/net/wireless/rt2x00/rt2800pci.c	2011-11-12 19:34:24.760314206 +0100
-+++ compat-wireless-2011-11-04/drivers/net/wireless/rt2x00/rt2800pci.c	2011-11-12 19:34:24.956314211 +0100
-@@ -84,7 +84,7 @@
+--- 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);
  }
  
@@ -11,31 +9,29 @@ Index: compat-wireless-2011-11-04/drivers/net/wireless/rt2x00/rt2800pci.c
  {
  	memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
  }
-@@ -938,8 +938,9 @@
- 	/*
- 	 * 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);
  	else
-Index: compat-wireless-2011-11-04/drivers/net/wireless/rt2x00/rt2x00pci.c
-===================================================================
---- compat-wireless-2011-11-04.orig/drivers/net/wireless/rt2x00/rt2x00pci.c	2011-11-12 19:34:24.704314204 +0100
-+++ compat-wireless-2011-11-04/drivers/net/wireless/rt2x00/rt2x00pci.c	2011-11-12 19:34:24.956314211 +0100
-@@ -255,6 +255,7 @@
+--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
++++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
+@@ -255,6 +255,7 @@ exit:
  int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
  {
  	struct ieee80211_hw *hw;
 +	struct rt2x00_platform_data *pdata;
  	struct rt2x00_dev *rt2x00dev;
  	int retval;
- 
-@@ -299,6 +300,12 @@
+ 	u16 chip;
+@@ -300,6 +301,12 @@ int rt2x00pci_probe(struct pci_dev *pci_
  	rt2x00dev->irq = pci_dev->irq;
  	rt2x00dev->name = pci_name(pci_dev);