Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b5d117e authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville
Browse files

ath5k: clean up queue manipulation 



Review spotted a couple of strange invocations to
ieee80211_wake_queues that could potentially cause problems:

 - queues are awakened in the calibration tasklet before
   phy calibration, and then again after calibration

 - queues are awakened inside reset when we're trying to
   drain the ath5k transmit queues, and again after
   reset is completed (in callers to ath5k_reset_wake).

In both cases the first wake is unnecessary, so remove it.

Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Acked-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1968cc78

drivers/net/wireless/ath/ath5k/base.c

+1 −2
Original line number Diff line number Diff line
@@ -1636,7 +1636,6 @@ ath5k_txq_cleanup(struct ath5k_softc *sc) 
					sc->txqs[i].link);

			}

	}

	ieee80211_wake_queues(sc->hw); /* XXX move to callers */



	for (i = 0; i < ARRAY_SIZE(sc->txqs); i++)

		if (sc->txqs[i].setup)
@@ -2775,7 +2774,7 @@ ath5k_tasklet_calibrate(unsigned long data) 
		 * to load new gain values.

		 */

		ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "calibration, resetting\n");

		ath5k_reset_wake(sc);

		ath5k_reset(sc, sc->curchan);

	}

	if (ath5k_hw_phy_calibrate(ah, sc->curchan))

		ATH5K_ERR(sc, "calibration of channel %u failed\n",