Commit fac6b6a0 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville

ath9k: resume aggregation immediately after a hardware reset

Since aggregation is usually triggered by tx completion, a hardware
reset (because of beacon stuck, tx hang or baseband hang) can
significantly delay the transmission of the next AMPDU (until the next
tx completion event).
Fix this by rescheduling aggregation after such a reset.
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dafeac38
...@@ -370,7 +370,7 @@ void ath_beacon_tasklet(unsigned long data) ...@@ -370,7 +370,7 @@ void ath_beacon_tasklet(unsigned long data)
ath_print(common, ATH_DBG_BSTUCK, ath_print(common, ATH_DBG_BSTUCK,
"beacon is officially stuck\n"); "beacon is officially stuck\n");
sc->sc_flags |= SC_OP_TSF_RESET; sc->sc_flags |= SC_OP_TSF_RESET;
ath_reset(sc, false); ath_reset(sc, true);
} }
return; return;
......
...@@ -580,7 +580,7 @@ void ath_hw_check(struct work_struct *work) ...@@ -580,7 +580,7 @@ void ath_hw_check(struct work_struct *work)
msleep(1); msleep(1);
} }
ath_reset(sc, false); ath_reset(sc, true);
out: out:
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
...@@ -598,7 +598,7 @@ void ath9k_tasklet(unsigned long data) ...@@ -598,7 +598,7 @@ void ath9k_tasklet(unsigned long data)
ath9k_ps_wakeup(sc); ath9k_ps_wakeup(sc);
if (status & ATH9K_INT_FATAL) { if (status & ATH9K_INT_FATAL) {
ath_reset(sc, false); ath_reset(sc, true);
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
return; return;
} }
......
...@@ -2163,7 +2163,7 @@ static void ath_tx_complete_poll_work(struct work_struct *work) ...@@ -2163,7 +2163,7 @@ static void ath_tx_complete_poll_work(struct work_struct *work)
ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET, ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
"tx hung, resetting the chip\n"); "tx hung, resetting the chip\n");
ath9k_ps_wakeup(sc); ath9k_ps_wakeup(sc);
ath_reset(sc, false); ath_reset(sc, true);
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment