diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-07-27 15:51:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-04 16:43:20 -0400 |
commit | e351cfbf4e6ccd8bf32555748a49dba5bc93fcb0 (patch) | |
tree | 12eaa166fc532dbb2aff4a5f6e84c266dec18422 /drivers/net/wireless/ath/ar9170/main.c | |
parent | 9ed21d390166ceb89e011d3dbd277475ff2f33c4 (diff) |
ar9170: remove unneeded flush_workqueue()
cancel_delayed_work_sync() and cancel_work_sync() are already being
used therefore already waiting for all pending work by the driver
to have been completed, no need to flush the mac80211 workqueue.
Cc: Christian Lamparter <chunkeey@web.de>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ar9170/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ar9170/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c index 85a1452a7c3c..099ed3c3ba28 100644 --- a/drivers/net/wireless/ath/ar9170/main.c +++ b/drivers/net/wireless/ath/ar9170/main.c | |||
@@ -1290,14 +1290,13 @@ static void ar9170_op_stop(struct ieee80211_hw *hw) | |||
1290 | if (IS_STARTED(ar)) | 1290 | if (IS_STARTED(ar)) |
1291 | ar->state = AR9170_IDLE; | 1291 | ar->state = AR9170_IDLE; |
1292 | 1292 | ||
1293 | flush_workqueue(ar->hw->workqueue); | ||
1294 | |||
1295 | cancel_delayed_work_sync(&ar->tx_janitor); | 1293 | cancel_delayed_work_sync(&ar->tx_janitor); |
1296 | #ifdef CONFIG_AR9170_LEDS | 1294 | #ifdef CONFIG_AR9170_LEDS |
1297 | cancel_delayed_work_sync(&ar->led_work); | 1295 | cancel_delayed_work_sync(&ar->led_work); |
1298 | #endif | 1296 | #endif |
1299 | cancel_work_sync(&ar->filter_config_work); | 1297 | cancel_work_sync(&ar->filter_config_work); |
1300 | cancel_work_sync(&ar->beacon_work); | 1298 | cancel_work_sync(&ar->beacon_work); |
1299 | |||
1301 | mutex_lock(&ar->mutex); | 1300 | mutex_lock(&ar->mutex); |
1302 | 1301 | ||
1303 | if (IS_ACCEPTING_CMD(ar)) { | 1302 | if (IS_ACCEPTING_CMD(ar)) { |