diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-09-13 08:46:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-14 16:14:25 -0400 |
commit | e7e16b90b477a07d17af37dceb2e8af1ddbd9712 (patch) | |
tree | c7f58d181d8a0a06718d2e28c9e88c4653204a24 /drivers/net | |
parent | 6bd1758d978f917dc0804f44e3528ef1a80d9d43 (diff) |
iwlwifi: do not force complete scan too early
Currently we force scan complete at the end of iwl_scan_cancel_timeout
function. This cause race condition when we can get a new scan request
from mac80211 and complete it by iwl_bg_complete from older scan. Change
code to force scan complete only when really needed: device goes down,
interface is removed or scan timeout occurs.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi W Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 38 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 |
5 files changed, 41 insertions, 15 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index d2315debd1b..646864a26ea 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -4071,13 +4071,15 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv) | |||
4071 | priv->cfg->ops->lib->cancel_deferred_work(priv); | 4071 | priv->cfg->ops->lib->cancel_deferred_work(priv); |
4072 | 4072 | ||
4073 | cancel_delayed_work_sync(&priv->init_alive_start); | 4073 | cancel_delayed_work_sync(&priv->init_alive_start); |
4074 | cancel_delayed_work(&priv->scan_check); | ||
4075 | cancel_work_sync(&priv->start_internal_scan); | ||
4076 | cancel_delayed_work(&priv->alive_start); | 4074 | cancel_delayed_work(&priv->alive_start); |
4077 | cancel_work_sync(&priv->run_time_calib_work); | 4075 | cancel_work_sync(&priv->run_time_calib_work); |
4078 | cancel_work_sync(&priv->beacon_update); | 4076 | cancel_work_sync(&priv->beacon_update); |
4077 | |||
4078 | iwl_cancel_scan_deferred_work(priv); | ||
4079 | |||
4079 | cancel_work_sync(&priv->bt_full_concurrency); | 4080 | cancel_work_sync(&priv->bt_full_concurrency); |
4080 | cancel_work_sync(&priv->bt_runtime_config); | 4081 | cancel_work_sync(&priv->bt_runtime_config); |
4082 | |||
4081 | del_timer_sync(&priv->statistics_periodic); | 4083 | del_timer_sync(&priv->statistics_periodic); |
4082 | del_timer_sync(&priv->ucode_trace); | 4084 | del_timer_sync(&priv->ucode_trace); |
4083 | } | 4085 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index b04a4f81ee9..393f02d94c4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -2089,8 +2089,10 @@ void iwl_mac_remove_interface(struct ieee80211_hw *hw, | |||
2089 | WARN_ON(ctx->vif != vif); | 2089 | WARN_ON(ctx->vif != vif); |
2090 | ctx->vif = NULL; | 2090 | ctx->vif = NULL; |
2091 | 2091 | ||
2092 | if (priv->scan_vif == vif) | 2092 | if (priv->scan_vif == vif) { |
2093 | iwl_scan_cancel_timeout(priv, 100); | 2093 | iwl_scan_cancel_timeout(priv, 200); |
2094 | iwl_force_scan_end(priv); | ||
2095 | } | ||
2094 | iwl_set_mode(priv, vif); | 2096 | iwl_set_mode(priv, vif); |
2095 | 2097 | ||
2096 | if (!ctx->always_active) | 2098 | if (!ctx->always_active) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 8dab074e491..f1d40c6173c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -553,6 +553,7 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags) | |||
553 | void iwl_init_scan_params(struct iwl_priv *priv); | 553 | void iwl_init_scan_params(struct iwl_priv *priv); |
554 | int iwl_scan_cancel(struct iwl_priv *priv); | 554 | int iwl_scan_cancel(struct iwl_priv *priv); |
555 | int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); | 555 | int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms); |
556 | void iwl_force_scan_end(struct iwl_priv *priv); | ||
556 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, | 557 | int iwl_mac_hw_scan(struct ieee80211_hw *hw, |
557 | struct ieee80211_vif *vif, | 558 | struct ieee80211_vif *vif, |
558 | struct cfg80211_scan_request *req); | 559 | struct cfg80211_scan_request *req); |
@@ -568,6 +569,7 @@ u16 iwl_get_passive_dwell_time(struct iwl_priv *priv, | |||
568 | enum ieee80211_band band, | 569 | enum ieee80211_band band, |
569 | struct ieee80211_vif *vif); | 570 | struct ieee80211_vif *vif); |
570 | void iwl_setup_scan_deferred_work(struct iwl_priv *priv); | 571 | void iwl_setup_scan_deferred_work(struct iwl_priv *priv); |
572 | void iwl_cancel_scan_deferred_work(struct iwl_priv *priv); | ||
571 | 573 | ||
572 | /* For faster active scanning, scan will move to the next channel if fewer than | 574 | /* For faster active scanning, scan will move to the next channel if fewer than |
573 | * PLCP_QUIET_THRESH packets are heard on this channel within | 575 | * PLCP_QUIET_THRESH packets are heard on this channel within |
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index da037b2f08b..af9a83669f5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
@@ -106,14 +106,22 @@ static void iwl_complete_scan(struct iwl_priv *priv, bool aborted) | |||
106 | priv->scan_request = NULL; | 106 | priv->scan_request = NULL; |
107 | } | 107 | } |
108 | 108 | ||
109 | static void iwl_force_scan_end(struct iwl_priv *priv) | 109 | void iwl_force_scan_end(struct iwl_priv *priv) |
110 | { | 110 | { |
111 | lockdep_assert_held(&priv->mutex); | ||
112 | |||
113 | if (!test_bit(STATUS_SCANNING, &priv->status)) { | ||
114 | IWL_DEBUG_SCAN(priv, "Forcing scan end while not scanning\n"); | ||
115 | return; | ||
116 | } | ||
117 | |||
111 | IWL_DEBUG_SCAN(priv, "Forcing scan end\n"); | 118 | IWL_DEBUG_SCAN(priv, "Forcing scan end\n"); |
112 | clear_bit(STATUS_SCANNING, &priv->status); | 119 | clear_bit(STATUS_SCANNING, &priv->status); |
113 | clear_bit(STATUS_SCAN_HW, &priv->status); | 120 | clear_bit(STATUS_SCAN_HW, &priv->status); |
114 | clear_bit(STATUS_SCAN_ABORTING, &priv->status); | 121 | clear_bit(STATUS_SCAN_ABORTING, &priv->status); |
115 | iwl_complete_scan(priv, true); | 122 | iwl_complete_scan(priv, true); |
116 | } | 123 | } |
124 | EXPORT_SYMBOL(iwl_force_scan_end); | ||
117 | 125 | ||
118 | static void iwl_do_scan_abort(struct iwl_priv *priv) | 126 | static void iwl_do_scan_abort(struct iwl_priv *priv) |
119 | { | 127 | { |
@@ -157,7 +165,6 @@ EXPORT_SYMBOL(iwl_scan_cancel); | |||
157 | */ | 165 | */ |
158 | int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms) | 166 | int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms) |
159 | { | 167 | { |
160 | int ret; | ||
161 | unsigned long timeout = jiffies + msecs_to_jiffies(ms); | 168 | unsigned long timeout = jiffies + msecs_to_jiffies(ms); |
162 | 169 | ||
163 | lockdep_assert_held(&priv->mutex); | 170 | lockdep_assert_held(&priv->mutex); |
@@ -172,10 +179,7 @@ int iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms) | |||
172 | msleep(20); | 179 | msleep(20); |
173 | } | 180 | } |
174 | 181 | ||
175 | ret = test_bit(STATUS_SCAN_HW, &priv->status); | 182 | return test_bit(STATUS_SCAN_HW, &priv->status); |
176 | if (ret) | ||
177 | iwl_force_scan_end(priv); | ||
178 | return ret; | ||
179 | } | 183 | } |
180 | EXPORT_SYMBOL(iwl_scan_cancel_timeout); | 184 | EXPORT_SYMBOL(iwl_scan_cancel_timeout); |
181 | 185 | ||
@@ -490,8 +494,11 @@ static void iwl_bg_scan_check(struct work_struct *data) | |||
490 | struct iwl_priv *priv = | 494 | struct iwl_priv *priv = |
491 | container_of(data, struct iwl_priv, scan_check.work); | 495 | container_of(data, struct iwl_priv, scan_check.work); |
492 | 496 | ||
497 | /* Since we are here firmware does not finish scan and | ||
498 | * most likely is in bad shape, so we don't bother to | ||
499 | * send abort command, just force scan complete to mac80211 */ | ||
493 | mutex_lock(&priv->mutex); | 500 | mutex_lock(&priv->mutex); |
494 | iwl_scan_cancel_timeout(priv, 200); | 501 | iwl_force_scan_end(priv); |
495 | mutex_unlock(&priv->mutex); | 502 | mutex_unlock(&priv->mutex); |
496 | } | 503 | } |
497 | 504 | ||
@@ -547,8 +554,8 @@ static void iwl_bg_abort_scan(struct work_struct *work) | |||
547 | { | 554 | { |
548 | struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan); | 555 | struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan); |
549 | 556 | ||
550 | cancel_delayed_work(&priv->scan_check); | 557 | /* We keep scan_check work queued in case when firmware will not |
551 | 558 | * report back scan completed notification */ | |
552 | mutex_lock(&priv->mutex); | 559 | mutex_lock(&priv->mutex); |
553 | iwl_scan_cancel_timeout(priv, 200); | 560 | iwl_scan_cancel_timeout(priv, 200); |
554 | mutex_unlock(&priv->mutex); | 561 | mutex_unlock(&priv->mutex); |
@@ -631,3 +638,16 @@ void iwl_setup_scan_deferred_work(struct iwl_priv *priv) | |||
631 | } | 638 | } |
632 | EXPORT_SYMBOL(iwl_setup_scan_deferred_work); | 639 | EXPORT_SYMBOL(iwl_setup_scan_deferred_work); |
633 | 640 | ||
641 | void iwl_cancel_scan_deferred_work(struct iwl_priv *priv) | ||
642 | { | ||
643 | cancel_work_sync(&priv->start_internal_scan); | ||
644 | cancel_work_sync(&priv->abort_scan); | ||
645 | cancel_work_sync(&priv->scan_completed); | ||
646 | |||
647 | if (cancel_delayed_work_sync(&priv->scan_check)) { | ||
648 | mutex_lock(&priv->mutex); | ||
649 | iwl_force_scan_end(priv); | ||
650 | mutex_unlock(&priv->mutex); | ||
651 | } | ||
652 | } | ||
653 | EXPORT_SYMBOL(iwl_cancel_scan_deferred_work); | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 6cc5ba2a2e3..116777122a7 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -3762,10 +3762,10 @@ static void iwl3945_cancel_deferred_work(struct iwl_priv *priv) | |||
3762 | iwl3945_hw_cancel_deferred_work(priv); | 3762 | iwl3945_hw_cancel_deferred_work(priv); |
3763 | 3763 | ||
3764 | cancel_delayed_work_sync(&priv->init_alive_start); | 3764 | cancel_delayed_work_sync(&priv->init_alive_start); |
3765 | cancel_delayed_work(&priv->scan_check); | ||
3766 | cancel_delayed_work(&priv->alive_start); | 3765 | cancel_delayed_work(&priv->alive_start); |
3767 | cancel_work_sync(&priv->start_internal_scan); | ||
3768 | cancel_work_sync(&priv->beacon_update); | 3766 | cancel_work_sync(&priv->beacon_update); |
3767 | |||
3768 | iwl_cancel_scan_deferred_work(priv); | ||
3769 | } | 3769 | } |
3770 | 3770 | ||
3771 | static struct attribute *iwl3945_sysfs_entries[] = { | 3771 | static struct attribute *iwl3945_sysfs_entries[] = { |