diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-09 14:07:12 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-09 14:07:12 -0500 |
| commit | e7ab5f1c323e137120561daeec75e91a1bd9ec8b (patch) | |
| tree | 758be4a11287005187b055ee8f8112a24d7d8ce5 /drivers/net/wireless/ath/ath9k | |
| parent | 1af32f0fcf33ddca52c8fd2b5bc84c129dcb1bdd (diff) | |
| parent | 329456d1ffb416c220813725b7363cda9975c9aa (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 93fbe6f4089..d2348a5a780 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -286,7 +286,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) ath_start_ani(common); } - if (ath9k_hw_ops(ah)->antdiv_comb_conf_get && sc->ant_rx != 3) { + if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) { struct ath_hw_antcomb_conf div_ant_conf; u8 lna_conf; |