diff options
author | John W. Linville | 2011-01-28 22:23:14 +0100 |
---|---|---|
committer | John W. Linville | 2011-01-28 22:23:14 +0100 |
commit | 3e11210d46a4f252f41db6e442b46026aeddbb59 (patch) | |
tree | b258375de649a5e04e8d567c850b47c41f8ceb11 /drivers/net/wireless/ath/ath5k/base.c | |
parent | ath9k: fix compile error in non-debug ath_debug_stat_tx() stub (diff) | |
parent | ath9k: Fix power save usage count imbalance on deinit (diff) | |
download | kernel-qcow2-linux-3e11210d46a4f252f41db6e442b46026aeddbb59.tar.gz kernel-qcow2-linux-3e11210d46a4f252f41db6e442b46026aeddbb59.tar.xz kernel-qcow2-linux-3e11210d46a4f252f41db6e442b46026aeddbb59.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/init.c
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.c')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index e9e7af6e4b62..dbc45e085434 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -2280,6 +2280,8 @@ ath5k_tx_complete_poll_work(struct work_struct *work) int i; bool needreset = false; + mutex_lock(&sc->lock); + for (i = 0; i < ARRAY_SIZE(sc->txqs); i++) { if (sc->txqs[i].setup) { txq = &sc->txqs[i]; @@ -2307,6 +2309,8 @@ ath5k_tx_complete_poll_work(struct work_struct *work) ath5k_reset(sc, NULL, true); } + mutex_unlock(&sc->lock); + ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, msecs_to_jiffies(ATH5K_TX_COMPLETE_POLL_INT)); } |