package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch

   1 --- a/drivers/net/wireless/ath/ath9k/main.c
   2 +++ b/drivers/net/wireless/ath/ath9k/main.c
   3 @@ -15,6 +15,7 @@
   4   */
   5
   6  #include <linux/nl80211.h>
   7 +#include <linux/ath9k_platform.h>
   8  #include "ath9k.h"
   9  #include "btcoex.h"
  10
  11 --- a/drivers/net/wireless/ath/ath9k/init.c
  12 +++ b/drivers/net/wireless/ath/ath9k/init.c
  13 @@ -565,6 +565,7 @@ static int ath9k_init_softc(u16 devid, s
  14  {
  15         struct ath_hw *ah = NULL;
  16         struct ath_common *common;
  17 +       struct ath9k_platform_data *pdata;
  18         int ret = 0, i;
  19         int csz = 0;
  20
  21 @@ -576,6 +577,10 @@ static int ath9k_init_softc(u16 devid, s
  22         ah->hw_version.subsysid = subsysid;
  23         sc->sc_ah = ah;
  24
  25 +       pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
  26 +       if (!pdata)
  27 +               ah->ah_flags |= AH_USE_EEPROM;
  28 +
  29         common = ath9k_hw_common(ah);
  30         common->ops = &ath9k_common_ops;
  31         common->bus_ops = bus_ops;
  32 --- a/drivers/net/wireless/ath/ath9k/hw.c
  33 +++ b/drivers/net/wireless/ath/ath9k/hw.c
  34 @@ -418,10 +418,6 @@ static void ath9k_hw_init_defaults(struc
  35         ah->hw_version.magic = AR5416_MAGIC;
  36         ah->hw_version.subvendorid = 0;
  37
  38 -       ah->ah_flags = 0;
  39 -       if (!AR_SREV_9100(ah))
  40 -               ah->ah_flags = AH_USE_EEPROM;
  41 -
  42         ah->atim_window = 0;
  43         ah->sta_id1_defaults = AR_STA_ID1_CRPT_MIC_ENABLE;
  44         ah->beacon_interval = 100;