diff options
| author |   Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-07-27 12:51:37 -0700 |
|---|---|---|
| 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 | at76c50x-usb: cancel scan work at stop callback (diff) | |
| download | linux-dev-e351cfbf4e6ccd8bf32555748a49dba5bc93fcb0.tar.xz linux-dev-e351cfbf4e6ccd8bf32555748a49dba5bc93fcb0.zip | |
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) if (IS_STARTED(ar)) ar->state = AR9170_IDLE; - flush_workqueue(ar->hw->workqueue); - cancel_delayed_work_sync(&ar->tx_janitor); #ifdef CONFIG_AR9170_LEDS cancel_delayed_work_sync(&ar->led_work); #endif cancel_work_sync(&ar->filter_config_work); cancel_work_sync(&ar->beacon_work); + mutex_lock(&ar->mutex); if (IS_ACCEPTING_CMD(ar)) { |