[ifxmips] fixes uboot compile error

[openwrt.git] / 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 8beb224..799c118 100644 (file)
--- 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
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c

-@@ -433,11 +433,8 @@ static void ath9k_hw_init_defaults(struc
+@@ -385,11 +385,8 @@ static void ath9k_hw_init_defaults(struc

        ah->hw_version.magic = AR5416_MAGIC;
        ah->hw_version.subvendorid = 0;
  
        ah->hw_version.magic = AR5416_MAGIC;
        ah->hw_version.subvendorid = 0;
  


@@ -22,22 +22,24 @@
  #include "ath9k.h"
  #include "btcoex.h"
  
  #include "ath9k.h"
  #include "btcoex.h"
  

-@@ -1633,6 +1634,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;
  {
        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 csz = 0;

-       int qnum;
-@@ -1656,6 +1658,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;
        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;
 +
 +      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 = ath9k_hw_common(ah);

+       common->ops = &ath9k_common_ops;
+       common->bus_ops = bus_ops;