package/mac80211/patches/520-ath9k_ar9285_diversity_fix.patch

   1 --- a/drivers/net/wireless/ath/ath9k/eeprom.h
   2 +++ b/drivers/net/wireless/ath/ath9k/eeprom.h
   3 @@ -670,7 +670,7 @@ struct eeprom_ops {
   4         int (*get_eeprom_ver)(struct ath_hw *hw);
   5         int (*get_eeprom_rev)(struct ath_hw *hw);
   6         u8 (*get_num_ant_config)(struct ath_hw *hw, enum ieee80211_band band);
   7 -       u16 (*get_eeprom_antenna_cfg)(struct ath_hw *hw,
   8 +       u32 (*get_eeprom_antenna_cfg)(struct ath_hw *hw,
   9                                       struct ath9k_channel *chan);
  10         void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan);
  11         void (*set_addac)(struct ath_hw *hw, struct ath9k_channel *chan);
  12 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
  13 +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
  14 @@ -1130,13 +1130,13 @@ static u8 ath9k_hw_ar9287_get_num_ant_co
  15         return 1;
  16  }
  17
  18 -static u16 ath9k_hw_ar9287_get_eeprom_antenna_cfg(struct ath_hw *ah,
  19 +static u32 ath9k_hw_ar9287_get_eeprom_antenna_cfg(struct ath_hw *ah,
  20                                                   struct ath9k_channel *chan)
  21  {
  22         struct ar9287_eeprom *eep = &ah->eeprom.map9287;
  23         struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
  24
  25 -       return pModal->antCtrlCommon & 0xFFFF;
  26 +       return pModal->antCtrlCommon;
  27  }
  28
  29  static u16 ath9k_hw_ar9287_get_spur_channel(struct ath_hw *ah,
  30 --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
  31 +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
  32 @@ -1438,14 +1438,14 @@ static u8 ath9k_hw_def_get_num_ant_confi
  33         return num_ant_config;
  34  }
  35
  36 -static u16 ath9k_hw_def_get_eeprom_antenna_cfg(struct ath_hw *ah,
  37 +static u32 ath9k_hw_def_get_eeprom_antenna_cfg(struct ath_hw *ah,
  38                                                struct ath9k_channel *chan)
  39  {
  40         struct ar5416_eeprom_def *eep = &ah->eeprom.def;
  41         struct modal_eep_header *pModal =
  42                 &(eep->modalHeader[IS_CHAN_2GHZ(chan)]);
  43
  44 -       return pModal->antCtrlCommon & 0xFFFF;
  45 +       return pModal->antCtrlCommon;
  46  }
  47
  48  static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
  49 --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
  50 +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
  51 @@ -1150,13 +1150,13 @@ static void ath9k_hw_4k_set_board_values
  52         }
  53  }
  54
  55 -static u16 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah,
  56 +static u32 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah,
  57                                               struct ath9k_channel *chan)
  58  {
  59         struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;
  60         struct modal_eep_4k_header *pModal = &eep->modalHeader;
  61
  62 -       return pModal->antCtrlCommon & 0xFFFF;
  63 +       return pModal->antCtrlCommon;
  64  }
  65
  66  static u8 ath9k_hw_4k_get_num_ant_config(struct ath_hw *ah,
  67 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
  68 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
  69 @@ -951,7 +951,7 @@ static u8 ath9k_hw_ar9300_get_num_ant_co
  70         return 1;
  71  }
  72
  73 -static u16 ath9k_hw_ar9300_get_eeprom_antenna_cfg(struct ath_hw *ah,
  74 +static u32 ath9k_hw_ar9300_get_eeprom_antenna_cfg(struct ath_hw *ah,
  75                                                   struct ath9k_channel *chan)
  76  {
  77         return -EINVAL;