openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Emmanuel Grumbach 2011-08-25 23:10:41 -07:00 committed by John W. Linville
parent cefeaa5fa0
commit 74e28e4409
10 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
View File

@ -388,7 +388,7 @@ void iwl_check_abort_status(struct iwl_priv *priv,
if (frame_count == 1 && status == TX_STATUS_FAIL_RFKILL_FLUSH) { if (frame_count == 1 && status == TX_STATUS_FAIL_RFKILL_FLUSH) {
IWL_ERR(priv, "Tx flush command to flush out all frames\n"); IWL_ERR(priv, "Tx flush command to flush out all frames\n");
if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
queue_work(priv->workqueue, &priv->tx_flush); queue_work(priv->shrd->workqueue, &priv->tx_flush);
} }
} }
@ -1620,7 +1620,7 @@ static void iwlagn_set_kill_msk(struct iwl_priv *priv,
priv->kill_cts_mask = bt_kill_cts_msg[kill_msk]; priv->kill_cts_mask = bt_kill_cts_msg[kill_msk];
/* schedule to send runtime bt_config */ /* schedule to send runtime bt_config */
queue_work(priv->workqueue, &priv->bt_runtime_config); queue_work(priv->shrd->workqueue, &priv->bt_runtime_config);
} }
} }
@ -1664,7 +1664,7 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,
IWL_BT_COEX_TRAFFIC_LOAD_NONE; IWL_BT_COEX_TRAFFIC_LOAD_NONE;
} }
priv->bt_status = coex->bt_status; priv->bt_status = coex->bt_status;
queue_work(priv->workqueue, queue_work(priv->shrd->workqueue,
&priv->bt_traffic_change_work); &priv->bt_traffic_change_work);
} }
} }

2
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
View File

@ -893,7 +893,7 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
rs_fill_link_cmd(priv, lq_sta, tbl->current_rate); rs_fill_link_cmd(priv, lq_sta, tbl->current_rate);
iwl_send_lq_cmd(priv, ctx, &lq_sta->lq, CMD_ASYNC, false); iwl_send_lq_cmd(priv, ctx, &lq_sta->lq, CMD_ASYNC, false);
queue_work(priv->workqueue, &priv->bt_full_concurrency); queue_work(priv->shrd->workqueue, &priv->bt_full_concurrency);
} }
} }

6
drivers/net/wireless/iwlwifi/iwl-agn-tt.c
View File

@ -569,7 +569,7 @@ void iwl_tt_enter_ct_kill(struct iwl_priv *priv)
return; return;
IWL_DEBUG_TEMP(priv, "Queueing critical temperature enter.\n"); IWL_DEBUG_TEMP(priv, "Queueing critical temperature enter.\n");
queue_work(priv->workqueue, &priv->ct_enter); queue_work(priv->shrd->workqueue, &priv->ct_enter);
} }
void iwl_tt_exit_ct_kill(struct iwl_priv *priv) void iwl_tt_exit_ct_kill(struct iwl_priv *priv)
@ -578,7 +578,7 @@ void iwl_tt_exit_ct_kill(struct iwl_priv *priv)
return; return;
IWL_DEBUG_TEMP(priv, "Queueing critical temperature exit.\n"); IWL_DEBUG_TEMP(priv, "Queueing critical temperature exit.\n");
queue_work(priv->workqueue, &priv->ct_exit); queue_work(priv->shrd->workqueue, &priv->ct_exit);
} }
static void iwl_bg_tt_work(struct work_struct *work) static void iwl_bg_tt_work(struct work_struct *work)
@ -604,7 +604,7 @@ void iwl_tt_handler(struct iwl_priv *priv)
return; return;
IWL_DEBUG_TEMP(priv, "Queueing thermal throttling work.\n"); IWL_DEBUG_TEMP(priv, "Queueing thermal throttling work.\n");
queue_work(priv->workqueue, &priv->tt_work); queue_work(priv->shrd->workqueue, &priv->tt_work);
} }
/* Thermal throttling initialization /* Thermal throttling initialization

16
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@ -2286,7 +2286,7 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)
iwl_down(priv); iwl_down(priv);
flush_workqueue(priv->workqueue); flush_workqueue(priv->shrd->workqueue);
/* User space software may expect getting rfkill changes /* User space software may expect getting rfkill changes
* even if interface is down */ * even if interface is down */
@ -3340,7 +3340,7 @@ static int iwl_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
static void iwl_setup_deferred_work(struct iwl_priv *priv) static void iwl_setup_deferred_work(struct iwl_priv *priv)
{ {
priv->workqueue = create_singlethread_workqueue(DRV_NAME); priv->shrd->workqueue = create_singlethread_workqueue(DRV_NAME);
init_waitqueue_head(&priv->wait_command_queue); init_waitqueue_head(&priv->wait_command_queue);
@ -3746,8 +3746,8 @@ int iwl_probe(struct iwl_bus *bus, struct iwl_cfg *cfg)
return 0; return 0;
out_destroy_workqueue: out_destroy_workqueue:
destroy_workqueue(priv->workqueue); destroy_workqueue(priv->shrd->workqueue);
priv->workqueue = NULL; priv->shrd->workqueue = NULL;
iwl_uninit_drv(priv); iwl_uninit_drv(priv);
out_free_eeprom: out_free_eeprom:
iwl_eeprom_free(priv); iwl_eeprom_free(priv);
@ -3808,13 +3808,13 @@ void __devexit iwl_remove(struct iwl_priv * priv)
iwl_eeprom_free(priv); iwl_eeprom_free(priv);
/*netif_stop_queue(dev); */ /*netif_stop_queue(dev); */
flush_workqueue(priv->workqueue); flush_workqueue(priv->shrd->workqueue);
/* ieee80211_unregister_hw calls iwl_mac_stop, which flushes /* ieee80211_unregister_hw calls iwl_mac_stop, which flushes
* priv->workqueue... so we can't take down the workqueue * priv->shrd->workqueue... so we can't take down the workqueue
* until now... */ * until now... */
destroy_workqueue(priv->workqueue); destroy_workqueue(priv->shrd->workqueue);
priv->workqueue = NULL; priv->shrd->workqueue = NULL;
iwl_free_traffic_mem(priv); iwl_free_traffic_mem(priv);
trans_free(&priv->trans); trans_free(&priv->trans);

2
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@ -894,7 +894,7 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
if (iwlagn_mod_params.restart_fw) { if (iwlagn_mod_params.restart_fw) {
IWL_DEBUG(priv, IWL_DL_FW_ERRORS, IWL_DEBUG(priv, IWL_DL_FW_ERRORS,
"Restarting adapter due to uCode error.\n"); "Restarting adapter due to uCode error.\n");
queue_work(priv->workqueue, &priv->restart); queue_work(priv->shrd->workqueue, &priv->restart);
} else } else
IWL_DEBUG(priv, IWL_DL_FW_ERRORS, IWL_DEBUG(priv, IWL_DL_FW_ERRORS,
"Detected FW error, but not restarting\n"); "Detected FW error, but not restarting\n");

2
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@ -1431,8 +1431,6 @@ struct iwl_priv {
u32 inta_mask; u32 inta_mask;
struct workqueue_struct *workqueue;
struct work_struct restart; struct work_struct restart;
struct work_struct scan_completed; struct work_struct scan_completed;
struct work_struct rx_replenish; struct work_struct rx_replenish;

4
drivers/net/wireless/iwlwifi/iwl-rx.c
View File

@ -150,7 +150,7 @@ static void iwl_rx_beacon_notif(struct iwl_priv *priv,
priv->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status); priv->ibss_manager = le32_to_cpu(beacon->ibss_mgr_status);
if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) if (!test_bit(STATUS_EXIT_PENDING, &priv->status))
queue_work(priv->workqueue, &priv->beacon_update); queue_work(priv->shrd->workqueue, &priv->beacon_update);
} }
/* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */ /* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */
@ -487,7 +487,7 @@ static void iwl_rx_statistics(struct iwl_priv *priv,
if (unlikely(!test_bit(STATUS_SCANNING, &priv->status)) && if (unlikely(!test_bit(STATUS_SCANNING, &priv->status)) &&
(pkt->hdr.cmd == STATISTICS_NOTIFICATION)) { (pkt->hdr.cmd == STATISTICS_NOTIFICATION)) {
iwl_rx_calc_noise(priv); iwl_rx_calc_noise(priv);
queue_work(priv->workqueue, &priv->run_time_calib_work); queue_work(priv->shrd->workqueue, &priv->run_time_calib_work);
} }
if (priv->cfg->lib->temperature && change) if (priv->cfg->lib->temperature && change)
priv->cfg->lib->temperature(priv); priv->cfg->lib->temperature(priv);

11
drivers/net/wireless/iwlwifi/iwl-scan.c
View File

@ -160,7 +160,7 @@ static void iwl_do_scan_abort(struct iwl_priv *priv)
int iwl_scan_cancel(struct iwl_priv *priv) int iwl_scan_cancel(struct iwl_priv *priv)
{ {
IWL_DEBUG_SCAN(priv, "Queuing abort scan\n"); IWL_DEBUG_SCAN(priv, "Queuing abort scan\n");
queue_work(priv->workqueue, &priv->abort_scan); queue_work(priv->shrd->workqueue, &priv->abort_scan);
return 0; return 0;
} }
@ -263,7 +263,7 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
(priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2", (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
jiffies_to_msecs(jiffies - priv->scan_start)); jiffies_to_msecs(jiffies - priv->scan_start));
queue_work(priv->workqueue, &priv->scan_completed); queue_work(priv->shrd->workqueue, &priv->scan_completed);
if (priv->iw_mode != NL80211_IFTYPE_ADHOC && if (priv->iw_mode != NL80211_IFTYPE_ADHOC &&
iwl_advanced_bt_coexist(priv) && iwl_advanced_bt_coexist(priv) &&
@ -283,7 +283,8 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
IWL_BT_COEX_TRAFFIC_LOAD_NONE; IWL_BT_COEX_TRAFFIC_LOAD_NONE;
} }
priv->bt_status = scan_notif->bt_status; priv->bt_status = scan_notif->bt_status;
queue_work(priv->workqueue, &priv->bt_traffic_change_work); queue_work(priv->shrd->workqueue,
&priv->bt_traffic_change_work);
} }
} }
@ -394,7 +395,7 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv,
return ret; return ret;
} }
queue_delayed_work(priv->workqueue, &priv->scan_check, queue_delayed_work(priv->shrd->workqueue, &priv->scan_check,
IWL_SCAN_CHECK_WATCHDOG); IWL_SCAN_CHECK_WATCHDOG);
return 0; return 0;
@ -450,7 +451,7 @@ int iwl_mac_hw_scan(struct ieee80211_hw *hw,
*/ */
void iwl_internal_short_hw_scan(struct iwl_priv *priv) void iwl_internal_short_hw_scan(struct iwl_priv *priv)
{ {
queue_work(priv->workqueue, &priv->start_internal_scan); queue_work(priv->shrd->workqueue, &priv->start_internal_scan);
} }
static void iwl_bg_start_internal_scan(struct work_struct *work) static void iwl_bg_start_internal_scan(struct work_struct *work)

3
drivers/net/wireless/iwlwifi/iwl-shared.h
View File

@ -147,6 +147,7 @@ struct iwl_hw_params {
* @bus: pointer to the bus layer data * @bus: pointer to the bus layer data
* @priv: pointer to the upper layer data * @priv: pointer to the upper layer data
* @hw_params: see struct iwl_hw_params * @hw_params: see struct iwl_hw_params
* @workqueue: the workqueue used by all the layers of the driver
*/ */
struct iwl_shared { struct iwl_shared {
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
@ -158,6 +159,8 @@ struct iwl_shared {
struct iwl_bus *bus; struct iwl_bus *bus;
struct iwl_priv *priv; struct iwl_priv *priv;
struct iwl_hw_params hw_params; struct iwl_hw_params hw_params;
struct workqueue_struct *workqueue;
}; };
/*Whatever _m is (iwl_trans, iwl_priv, iwl_bus, these macros will work */ /*Whatever _m is (iwl_trans, iwl_priv, iwl_bus, these macros will work */

2
drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
View File

@ -224,7 +224,7 @@ static void iwlagn_rx_queue_restock(struct iwl_priv *priv)
/* If the pre-allocated buffer pool is dropping low, schedule to /* If the pre-allocated buffer pool is dropping low, schedule to
* refill it */ * refill it */
if (rxq->free_count <= RX_LOW_WATERMARK) if (rxq->free_count <= RX_LOW_WATERMARK)
queue_work(priv->workqueue, &priv->rx_replenish); queue_work(priv->shrd->workqueue, &priv->rx_replenish);
/* If we've added more space for the firmware to place data, tell it. /* If we've added more space for the firmware to place data, tell it.