diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/recv.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index f69dcdf0e2e6..c5b7cbe59bfa 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -1339,7 +1339,7 @@ static void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs) | |||
1339 | struct ath_hw_antcomb_conf div_ant_conf; | 1339 | struct ath_hw_antcomb_conf div_ant_conf; |
1340 | struct ath_ant_comb *antcomb = &sc->ant_comb; | 1340 | struct ath_ant_comb *antcomb = &sc->ant_comb; |
1341 | int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set; | 1341 | int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set; |
1342 | int curr_main_set, curr_bias; | 1342 | int curr_main_set; |
1343 | int main_rssi = rs->rs_rssi_ctl0; | 1343 | int main_rssi = rs->rs_rssi_ctl0; |
1344 | int alt_rssi = rs->rs_rssi_ctl1; | 1344 | int alt_rssi = rs->rs_rssi_ctl1; |
1345 | int rx_ant_conf, main_ant_conf; | 1345 | int rx_ant_conf, main_ant_conf; |
@@ -1393,7 +1393,6 @@ static void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs) | |||
1393 | ath9k_hw_antdiv_comb_conf_get(sc->sc_ah, &div_ant_conf); | 1393 | ath9k_hw_antdiv_comb_conf_get(sc->sc_ah, &div_ant_conf); |
1394 | curr_alt_set = div_ant_conf.alt_lna_conf; | 1394 | curr_alt_set = div_ant_conf.alt_lna_conf; |
1395 | curr_main_set = div_ant_conf.main_lna_conf; | 1395 | curr_main_set = div_ant_conf.main_lna_conf; |
1396 | curr_bias = div_ant_conf.fast_div_bias; | ||
1397 | 1396 | ||
1398 | antcomb->count++; | 1397 | antcomb->count++; |
1399 | 1398 | ||
@@ -1743,7 +1742,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) | |||
1743 | if ((sc->ps_flags & (PS_WAIT_FOR_BEACON | | 1742 | if ((sc->ps_flags & (PS_WAIT_FOR_BEACON | |
1744 | PS_WAIT_FOR_CAB | | 1743 | PS_WAIT_FOR_CAB | |
1745 | PS_WAIT_FOR_PSPOLL_DATA)) || | 1744 | PS_WAIT_FOR_PSPOLL_DATA)) || |
1746 | unlikely(ath9k_check_auto_sleep(sc))) | 1745 | ath9k_check_auto_sleep(sc)) |
1747 | ath_rx_ps(sc, skb); | 1746 | ath_rx_ps(sc, skb); |
1748 | spin_unlock_irqrestore(&sc->sc_pm_lock, flags); | 1747 | spin_unlock_irqrestore(&sc->sc_pm_lock, flags); |
1749 | 1748 | ||