X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c3a643f552f4d3a15e17f08eddb616086cc34157..e25263b21def36527d39e1e20aa72e6449c0c510:/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch

diff --git a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
index 6be788814..a83242f91 100644
--- a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
+++ b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -403,11 +403,8 @@ static void ath9k_hw_init_defaults(struc
+@@ -381,11 +381,8 @@ static void ath9k_hw_init_defaults(struc
  	ah->hw_version.magic = AR5416_MAGIC;
  	ah->hw_version.subvendorid = 0;
  
@@ -22,22 +22,24 @@
  #include "ath9k.h"
  #include "btcoex.h"
  
-@@ -1597,6 +1598,7 @@ static int ath_init_softc(u16 devid, str
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -531,6 +531,7 @@ static int ath9k_init_softc(u16 devid, s
  {
  	struct ath_hw *ah = NULL;
  	struct ath_common *common;
 +	struct ath9k_platform_data *pdata;
- 	int r = 0, i;
+ 	int ret = 0, i;
  	int csz = 0;
- 	int qnum;
-@@ -1619,6 +1621,10 @@ static int ath_init_softc(u16 devid, str
  
- 	ah->hw_version.devid = devid;
+@@ -542,6 +543,10 @@ static int ath9k_init_softc(u16 devid, s
  	ah->hw_version.subsysid = subsysid;
+ 	sc->sc_ah = ah;
+ 
 +	pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
 +	if (!pdata)
 +		ah->ah_flags |= AH_USE_EEPROM;
 +
- 	sc->sc_ah = ah;
- 
  	common = ath9k_hw_common(ah);
+ 	common->ops = &ath9k_common_ops;
+ 	common->bus_ops = bus_ops;