diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-16 16:41:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-16 16:41:55 -0400 |
| commit | d8d326dc7ae6bec2a999d674c5babb6bf490587a (patch) | |
| tree | 0169a23e34712e4a34db9c3dd658c14a59ded5d9 /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | fed396a585d8e1870b326f2e8e1888a72957abb8 (diff) | |
| parent | 021570e55b7152843376b9d9f60624e3e05ac054 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 5d3f51ff2f0d..386c5f96eff8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
| @@ -491,6 +491,7 @@ void iwl_bg_abort_scan(struct work_struct *work) | |||
| 491 | 491 | ||
| 492 | mutex_lock(&priv->mutex); | 492 | mutex_lock(&priv->mutex); |
| 493 | 493 | ||
| 494 | cancel_delayed_work_sync(&priv->scan_check); | ||
| 494 | set_bit(STATUS_SCAN_ABORTING, &priv->status); | 495 | set_bit(STATUS_SCAN_ABORTING, &priv->status); |
| 495 | iwl_send_scan_abort(priv); | 496 | iwl_send_scan_abort(priv); |
| 496 | 497 | ||