Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74e28e44 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: workqueue moves to iwl_shared 



Since it is used by all the layers, it needs to move to iwl_shared.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cefeaa5f

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+3 −3
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ void iwl_check_abort_status(struct iwl_priv *priv, 
	if (frame_count == 1 && status == TX_STATUS_FAIL_RFKILL_FLUSH) {

		IWL_ERR(priv, "Tx flush command to flush out all frames\n");

		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];



		/* 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;

			}

			priv->bt_status = coex->bt_status;

			queue_work(priv->workqueue,

			queue_work(priv->shrd->workqueue,

				   &priv->bt_traffic_change_work);

		}

	}

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

		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);

	}

}

drivers/net/wireless/iwlwifi/iwl-agn-tt.c

+3 −3
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ void iwl_tt_enter_ct_kill(struct iwl_priv *priv) 
		return;



	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)
@@ -578,7 +578,7 @@ void iwl_tt_exit_ct_kill(struct iwl_priv *priv) 
		return;



	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)
@@ -604,7 +604,7 @@ void iwl_tt_handler(struct iwl_priv *priv) 
		return;



	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

drivers/net/wireless/iwlwifi/iwl-agn.c

+8 −8
Original line number Diff line number Diff line
@@ -2286,7 +2286,7 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw) 


	iwl_down(priv);



	flush_workqueue(priv->workqueue);

	flush_workqueue(priv->shrd->workqueue);



	/* User space software may expect getting rfkill changes

	 * 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)

{

	priv->workqueue = create_singlethread_workqueue(DRV_NAME);

	priv->shrd->workqueue = create_singlethread_workqueue(DRV_NAME);



	init_waitqueue_head(&priv->wait_command_queue);
@@ -3746,8 +3746,8 @@ int iwl_probe(struct iwl_bus *bus, struct iwl_cfg *cfg) 
	return 0;



out_destroy_workqueue:

	destroy_workqueue(priv->workqueue);

	priv->workqueue = NULL;

	destroy_workqueue(priv->shrd->workqueue);

	priv->shrd->workqueue = NULL;

	iwl_uninit_drv(priv);

out_free_eeprom:

	iwl_eeprom_free(priv);
@@ -3808,13 +3808,13 @@ void __devexit iwl_remove(struct iwl_priv * priv) 
	iwl_eeprom_free(priv);



	/*netif_stop_queue(dev); */

	flush_workqueue(priv->workqueue);

	flush_workqueue(priv->shrd->workqueue);



	/* 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... */

	destroy_workqueue(priv->workqueue);

	priv->workqueue = NULL;

	destroy_workqueue(priv->shrd->workqueue);

	priv->shrd->workqueue = NULL;

	iwl_free_traffic_mem(priv);



	trans_free(&priv->trans);

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) 
		if (iwlagn_mod_params.restart_fw) {

			IWL_DEBUG(priv, IWL_DL_FW_ERRORS,

				  "Restarting adapter due to uCode error.\n");

			queue_work(priv->workqueue, &priv->restart);

			queue_work(priv->shrd->workqueue, &priv->restart);

		} else

			IWL_DEBUG(priv, IWL_DL_FW_ERRORS,

				  "Detected FW error, but not restarting\n");