projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
[linux-2.6-block.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
main.c
diff --git
a/drivers/net/wireless/ath/ath9k/main.c
b/drivers/net/wireless/ath/ath9k/main.c
index 5007297c9447a63131e23e35ca5fc33f1c43a8ec..7d920044d031b3370fc91ba44fc825c7796df932 100644
(file)
--- 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;