diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2013-07-23 06:55:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-07-24 11:02:39 -0400 |
commit | c2b8359d7878f75584ed68b7a2b930bd9bea814d (patch) | |
tree | 491257b9955fb717733f8b4874484d5588ec059d /drivers/net/wireless/ath/ath9k/ath9k.h | |
parent | a4df8f56e92104c5e7be82cc2c471e600ea3f9ef (diff) |
ath9k: Fix diversity combining for AR9285
When antenna diversity combining is enabled in the EEPROM,
the initial values for the MAIN/ALT config have to be
programmed correctly. This patch adds it for AR9285.
Since the diversity combining macros are common to all chip
families, remove the redundant AR9285 macros and move the
definitions to phy.h.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index c1224b5a257b..76e38d3540c0 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -591,13 +591,6 @@ static inline void ath_fill_led_pin(struct ath_softc *sc) | |||
591 | #define ATH_ANT_DIV_COMB_LNA1_DELTA_MID -2 | 591 | #define ATH_ANT_DIV_COMB_LNA1_DELTA_MID -2 |
592 | #define ATH_ANT_DIV_COMB_LNA1_DELTA_LOW 2 | 592 | #define ATH_ANT_DIV_COMB_LNA1_DELTA_LOW 2 |
593 | 593 | ||
594 | enum ath9k_ant_div_comb_lna_conf { | ||
595 | ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2, | ||
596 | ATH_ANT_DIV_COMB_LNA2, | ||
597 | ATH_ANT_DIV_COMB_LNA1, | ||
598 | ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2, | ||
599 | }; | ||
600 | |||
601 | struct ath_ant_comb { | 594 | struct ath_ant_comb { |
602 | u16 count; | 595 | u16 count; |
603 | u16 total_pkt_count; | 596 | u16 total_pkt_count; |