From d4d3ec5e202ef935d0e69ce82f94bebe27343402 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 23 May 2009 20:31:21 +0200 Subject: [PATCH] --- yaml --- r: 150675 b: refs/heads/master c: b55d6bcf9b7082ae613e5d532608abcd409164ca h: refs/heads/master i: 150673: c81f05158001b34cda043c6e4ddf25e956a19087 150671: c10341875ca3d0e77a74ed8be4d16887193a7d0a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ar9170/main.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f20e240d4f39..5f86a61ef075 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2431fe9a4b43ccf03589fa661662da6bfbd97282 +refs/heads/master: b55d6bcf9b7082ae613e5d532608abcd409164ca diff --git a/trunk/drivers/net/wireless/ath/ar9170/main.c b/trunk/drivers/net/wireless/ath/ar9170/main.c index 1657e891a6a7..63528f1b8d0e 100644 --- a/trunk/drivers/net/wireless/ath/ar9170/main.c +++ b/trunk/drivers/net/wireless/ath/ar9170/main.c @@ -343,7 +343,6 @@ static void ar9170_tx_status_janitor(struct work_struct *work) if (unlikely(!IS_STARTED(ar))) return ; - mutex_lock(&ar->mutex); /* recycle the garbage back to mac80211... one by one. */ while ((skb = skb_dequeue(&ar->global_tx_status_waste))) { #ifdef AR9170_QUEUE_DEBUG @@ -369,8 +368,6 @@ static void ar9170_tx_status_janitor(struct work_struct *work) if (skb_queue_len(&ar->global_tx_status_waste) > 0) queue_delayed_work(ar->hw->workqueue, &ar->tx_status_janitor, msecs_to_jiffies(100)); - - mutex_unlock(&ar->mutex); } static void ar9170_handle_command_response(struct ar9170 *ar, @@ -1013,10 +1010,10 @@ static void ar9170_op_stop(struct ieee80211_hw *hw) flush_workqueue(ar->hw->workqueue); - mutex_lock(&ar->mutex); cancel_delayed_work_sync(&ar->tx_status_janitor); cancel_work_sync(&ar->filter_config_work); cancel_work_sync(&ar->beacon_work); + mutex_lock(&ar->mutex); skb_queue_purge(&ar->global_tx_status_waste); skb_queue_purge(&ar->global_tx_status);