source: branches/backfire/package/mac80211/patches/520-ath9k_ar9285_diversity_fix.patch @ 22124

Last change on this file since 22124 was 22124, checked in by nbd, 6 years ago

[backfire] merge ath9k fixes from r22123

File size: 2.8 KB
  • drivers/net/wireless/ath/ath9k/eeprom.h

    a b struct eeprom_ops { 
    670670        int (*get_eeprom_ver)(struct ath_hw *hw); 
    671671        int (*get_eeprom_rev)(struct ath_hw *hw); 
    672672        u8 (*get_num_ant_config)(struct ath_hw *hw, enum ieee80211_band band); 
    673         u16 (*get_eeprom_antenna_cfg)(struct ath_hw *hw, 
     673        u32 (*get_eeprom_antenna_cfg)(struct ath_hw *hw, 
    674674                                      struct ath9k_channel *chan); 
    675675        void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan); 
    676676        void (*set_addac)(struct ath_hw *hw, struct ath9k_channel *chan); 
  • drivers/net/wireless/ath/ath9k/eeprom_9287.c

    a b static u8 ath9k_hw_ar9287_get_num_ant_co 
    11301130        return 1; 
    11311131} 
    11321132 
    1133 static u16 ath9k_hw_ar9287_get_eeprom_antenna_cfg(struct ath_hw *ah, 
     1133static u32 ath9k_hw_ar9287_get_eeprom_antenna_cfg(struct ath_hw *ah, 
    11341134                                                  struct ath9k_channel *chan) 
    11351135{ 
    11361136        struct ar9287_eeprom *eep = &ah->eeprom.map9287; 
    11371137        struct modal_eep_ar9287_header *pModal = &eep->modalHeader; 
    11381138 
    1139         return pModal->antCtrlCommon & 0xFFFF; 
     1139        return pModal->antCtrlCommon; 
    11401140} 
    11411141 
    11421142static u16 ath9k_hw_ar9287_get_spur_channel(struct ath_hw *ah, 
  • drivers/net/wireless/ath/ath9k/eeprom_def.c

    a b static u8 ath9k_hw_def_get_num_ant_confi 
    14381438        return num_ant_config; 
    14391439} 
    14401440 
    1441 static u16 ath9k_hw_def_get_eeprom_antenna_cfg(struct ath_hw *ah, 
     1441static u32 ath9k_hw_def_get_eeprom_antenna_cfg(struct ath_hw *ah, 
    14421442                                               struct ath9k_channel *chan) 
    14431443{ 
    14441444        struct ar5416_eeprom_def *eep = &ah->eeprom.def; 
    14451445        struct modal_eep_header *pModal = 
    14461446                &(eep->modalHeader[IS_CHAN_2GHZ(chan)]); 
    14471447 
    1448         return pModal->antCtrlCommon & 0xFFFF; 
     1448        return pModal->antCtrlCommon; 
    14491449} 
    14501450 
    14511451static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz) 
  • drivers/net/wireless/ath/ath9k/eeprom_4k.c

    a b static void ath9k_hw_4k_set_board_values 
    11501150        } 
    11511151} 
    11521152 
    1153 static u16 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah, 
     1153static u32 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah, 
    11541154                                              struct ath9k_channel *chan) 
    11551155{ 
    11561156        struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k; 
    11571157        struct modal_eep_4k_header *pModal = &eep->modalHeader; 
    11581158 
    1159         return pModal->antCtrlCommon & 0xFFFF; 
     1159        return pModal->antCtrlCommon; 
    11601160} 
    11611161 
    11621162static u8 ath9k_hw_4k_get_num_ant_config(struct ath_hw *ah, 
  • drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

    a b static u8 ath9k_hw_ar9300_get_num_ant_co 
    951951        return 1; 
    952952} 
    953953 
    954 static u16 ath9k_hw_ar9300_get_eeprom_antenna_cfg(struct ath_hw *ah, 
     954static u32 ath9k_hw_ar9300_get_eeprom_antenna_cfg(struct ath_hw *ah, 
    955955                                                  struct ath9k_channel *chan) 
    956956{ 
    957957        return -EINVAL; 
Note: See TracBrowser for help on using the repository browser.