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

Commit e43e85c4 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: refactor restart 



The WoWLAN resume code will have to essentially
do a restart, but without going through the work
struct. To support that, refactor the restart by
splitting out the preparation code into a new
function.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 4119904f

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

+37 −31
Original line number Diff line number Diff line
@@ -2493,21 +2493,16 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work) 
	mutex_unlock(&priv->mutex);

}



static void iwl_bg_restart(struct work_struct *data)

static void iwlagn_prepare_restart(struct iwl_priv *priv)

{

	struct iwl_priv *priv = container_of(data, struct iwl_priv, restart);



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return;



	if (test_and_clear_bit(STATUS_FW_ERROR, &priv->status)) {

	struct iwl_rxon_context *ctx;

	bool bt_full_concurrent;

	u8 bt_ci_compliance;

	u8 bt_load;

	u8 bt_status;



		mutex_lock(&priv->mutex);

	lockdep_assert_held(&priv->mutex);



	for_each_context(priv, ctx)

		ctx->vif = NULL;

	priv->is_open = 0;
@@ -2532,7 +2527,18 @@ static void iwl_bg_restart(struct work_struct *data) 
	priv->bt_ci_compliance = bt_ci_compliance;

	priv->bt_traffic_load = bt_load;

	priv->bt_status = bt_status;

}



static void iwl_bg_restart(struct work_struct *data)

{

	struct iwl_priv *priv = container_of(data, struct iwl_priv, restart);



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return;



	if (test_and_clear_bit(STATUS_FW_ERROR, &priv->status)) {

		mutex_lock(&priv->mutex);

		iwlagn_prepare_restart(priv);

		mutex_unlock(&priv->mutex);

		iwl_cancel_deferred_work(priv);

		ieee80211_restart_hw(priv->hw);