diff options
| author | Bob Copeland <me@bobcopeland.com> | 2011-01-18 08:06:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-18 15:10:31 -0500 |
| commit | 599b13adc2bf236da8f86a34b0b51168e19d3524 (patch) | |
| tree | f7f319d20d367360a8324070e9a6a9a77a3c6b08 | |
| parent | 811ea256b30b37091b5bbf41517404cf98ab56c1 (diff) | |
| download | linux-stable-599b13adc2bf236da8f86a34b0b51168e19d3524.tar.gz linux-stable-599b13adc2bf236da8f86a34b0b51168e19d3524.tar.bz2 linux-stable-599b13adc2bf236da8f86a34b0b51168e19d3524.zip | |
ath5k: fix locking in tx_complete_poll_work
ath5k_reset must be called with sc->lock. Since the tx queue
watchdog runs in a workqueue and accesses sc, it's appropriate
to just take the lock over the whole function.
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -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 019a74d533a6..09ae4ef0fd51 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)); } |