aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath5k/base.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index c085a06f1e05..38c41e3c7988 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -1636,7 +1636,6 @@ ath5k_txq_cleanup(struct ath5k_softc *sc)
1636 sc->txqs[i].link); 1636 sc->txqs[i].link);
1637 } 1637 }
1638 } 1638 }
1639 ieee80211_wake_queues(sc->hw); /* XXX move to callers */
1640 1639
1641 for (i = 0; i < ARRAY_SIZE(sc->txqs); i++) 1640 for (i = 0; i < ARRAY_SIZE(sc->txqs); i++)
1642 if (sc->txqs[i].setup) 1641 if (sc->txqs[i].setup)
@@ -2775,7 +2774,7 @@ ath5k_tasklet_calibrate(unsigned long data)
2775 * to load new gain values. 2774 * to load new gain values.
2776 */ 2775 */
2777 ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "calibration, resetting\n"); 2776 ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "calibration, resetting\n");
2778 ath5k_reset_wake(sc); 2777 ath5k_reset(sc, sc->curchan);
2779 } 2778 }
2780 if (ath5k_hw_phy_calibrate(ah, sc->curchan)) 2779 if (ath5k_hw_phy_calibrate(ah, sc->curchan))
2781 ATH5K_ERR(sc, "calibration of channel %u failed\n", 2780 ATH5K_ERR(sc, "calibration of channel %u failed\n",