diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-16 11:11:14 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-16 11:11:14 +0400 |
| commit | b26e478f8fd5b575684f021b05a5c6236ebb911a (patch) | |
| tree | 27d3b3eaf3fe10d05319ad3395b2569ad5f8f6d0 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | bcebcc468a6bcd3820fe9ad36b34220563efc93a (diff) | |
| parent | bb3c36863e8001fc21a88bebfdead4da4c23e848 (diff) | |
| download | linux-b26e478f8fd5b575684f021b05a5c6236ebb911a.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
net/ipv6/route.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -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 5007297c9447..7d920044d031 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; |