aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-scan.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-08-26 02:10:41 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-29 15:25:31 -0400
commit74e28e44095e30ffd2d0258e4fe91826a15247e7 (patch)
treeb4bc7ab6bc8e3a0690815c3b2078550a12b4265a /drivers/net/wireless/iwlwifi/iwl-scan.c
parentcefeaa5fa0be02cd51968975fec9cfaf7973bb3a (diff)
iwlagn: workqueue moves to iwl_shared
Since it is used by all the layers, it needs to move to iwl_shared. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index bddb2daf31bd..6610b1d687c8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -160,7 +160,7 @@ static void iwl_do_scan_abort(struct iwl_priv *priv)
160int iwl_scan_cancel(struct iwl_priv *priv) 160int iwl_scan_cancel(struct iwl_priv *priv)
161{ 161{
162 IWL_DEBUG_SCAN(priv, "Queuing abort scan\n"); 162 IWL_DEBUG_SCAN(priv, "Queuing abort scan\n");
163 queue_work(priv->workqueue, &priv->abort_scan); 163 queue_work(priv->shrd->workqueue, &priv->abort_scan);
164 return 0; 164 return 0;
165} 165}
166 166
@@ -263,7 +263,7 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
263 (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2", 263 (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
264 jiffies_to_msecs(jiffies - priv->scan_start)); 264 jiffies_to_msecs(jiffies - priv->scan_start));
265 265
266 queue_work(priv->workqueue, &priv->scan_completed); 266 queue_work(priv->shrd->workqueue, &priv->scan_completed);
267 267
268 if (priv->iw_mode != NL80211_IFTYPE_ADHOC && 268 if (priv->iw_mode != NL80211_IFTYPE_ADHOC &&
269 iwl_advanced_bt_coexist(priv) && 269 iwl_advanced_bt_coexist(priv) &&
@@ -283,7 +283,8 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
283 IWL_BT_COEX_TRAFFIC_LOAD_NONE; 283 IWL_BT_COEX_TRAFFIC_LOAD_NONE;
284 } 284 }
285 priv->bt_status = scan_notif->bt_status; 285 priv->bt_status = scan_notif->bt_status;
286 queue_work(priv->workqueue, &priv->bt_traffic_change_work); 286 queue_work(priv->shrd->workqueue,
287 &priv->bt_traffic_change_work);
287 } 288 }
288} 289}
289 290
@@ -394,7 +395,7 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv,
394 return ret; 395 return ret;
395 } 396 }
396 397
397 queue_delayed_work(priv->workqueue, &priv->scan_check, 398 queue_delayed_work(priv->shrd->workqueue, &priv->scan_check,
398 IWL_SCAN_CHECK_WATCHDOG); 399 IWL_SCAN_CHECK_WATCHDOG);
399 400
400 return 0; 401 return 0;
@@ -450,7 +451,7 @@ out_unlock:
450 */ 451 */
451void iwl_internal_short_hw_scan(struct iwl_priv *priv) 452void iwl_internal_short_hw_scan(struct iwl_priv *priv)
452{ 453{
453 queue_work(priv->workqueue, &priv->start_internal_scan); 454 queue_work(priv->shrd->workqueue, &priv->start_internal_scan);
454} 455}
455 456
456static void iwl_bg_start_internal_scan(struct work_struct *work) 457static void iwl_bg_start_internal_scan(struct work_struct *work)