diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-18 12:50:19 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-18 12:50:19 -0800 |
commit | f966a13f92913ce8cbd35bc7f066553c9f3d41b0 (patch) | |
tree | 5039770cf62f69317c974775190cc4f5919f8398 /drivers/net/wireless/ath/ath5k/base.c | |
parent | 7e96fbf2320782fb8f0970928026105cd34b41bd (diff) | |
parent | 38d59392b29437af3a702209b6a5196ef01f79a8 (diff) | |
download | kernel_samsung_smdk4412-f966a13f92913ce8cbd35bc7f066553c9f3d41b0.zip kernel_samsung_smdk4412-f966a13f92913ce8cbd35bc7f066553c9f3d41b0.tar.gz kernel_samsung_smdk4412-f966a13f92913ce8cbd35bc7f066553c9f3d41b0.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 019a74d..09ae4ef 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -2294,6 +2294,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]; @@ -2321,6 +2323,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)); } |