Skip to content

Commit

Permalink
ath9k: update hw_timer_enabled to false when we stop generic timers
Browse files Browse the repository at this point in the history
Update the 'hw_timer_enabled' to 'false' wherever we are stopping
hardware generic timers, excecpt the case where we start them
again immediately.

Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Mohammed Shafi Shajakhan authored and John W. Linville committed Sep 24, 2012
1 parent 97ed15c commit 5418b0f
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/net/wireless/ath/ath9k/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,10 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)
ath_dbg(ath9k_hw_common(ah), BTCOEX, "Starting btcoex timers\n");

/* make sure duty cycle timer is also stopped when resuming */
if (btcoex->hw_timer_enabled)
if (btcoex->hw_timer_enabled) {
ath9k_gen_timer_stop(sc->sc_ah, btcoex->no_stomp_timer);
btcoex->hw_timer_enabled = false;
}

btcoex->bt_priority_cnt = 0;
btcoex->bt_priority_time = jiffies;
Expand All @@ -342,18 +344,20 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc)

del_timer_sync(&btcoex->period_timer);

if (btcoex->hw_timer_enabled)
if (btcoex->hw_timer_enabled) {
ath9k_gen_timer_stop(ah, btcoex->no_stomp_timer);

btcoex->hw_timer_enabled = false;
btcoex->hw_timer_enabled = false;
}
}

void ath9k_btcoex_stop_gen_timer(struct ath_softc *sc)
{
struct ath_btcoex *btcoex = &sc->btcoex;

if (btcoex->hw_timer_enabled)
if (btcoex->hw_timer_enabled) {
ath9k_gen_timer_stop(sc->sc_ah, btcoex->no_stomp_timer);
btcoex->hw_timer_enabled = false;
}
}

u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc, u32 max_4ms_framelen)
Expand Down

0 comments on commit 5418b0f

Please sign in to comment.