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

Commit bc795df1 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: prio_tbl need to download before calibration 



For WiFi/BT combo devices, priority table always need to download
before perform any calibration operation.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent a5901cbb

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -2809,9 +2809,6 @@ static void iwl_alive_start(struct iwl_priv *priv) 
		goto restart;

		goto restart;

	}

	}





	if (priv->hw_params.calib_rt_cfg)

		iwlagn_send_calib_cfg_rt(priv, priv->hw_params.calib_rt_cfg);







	/* After the ALIVE response, we can send host commands to the uCode */

	/* After the ALIVE response, we can send host commands to the uCode */

	set_bit(STATUS_ALIVE, &priv->status);

	set_bit(STATUS_ALIVE, &priv->status);
@@ -2827,6 +2824,7 @@ static void iwl_alive_start(struct iwl_priv *priv) 
	if (iwl_is_rfkill(priv))

	if (iwl_is_rfkill(priv))

		return;

		return;





	/* download priority table before any calibration request */

	if (priv->cfg->bt_params &&

	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->advanced_bt_coexist) {

	    priv->cfg->bt_params->advanced_bt_coexist) {

		/* Configure Bluetooth device coexistence support */

		/* Configure Bluetooth device coexistence support */
@@ -2843,6 +2841,9 @@ static void iwl_alive_start(struct iwl_priv *priv) 
		iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_CLOSE,

		iwlagn_send_bt_env(priv, IWL_BT_COEX_ENV_CLOSE,

			BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);

			BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);

	}

	}

	if (priv->hw_params.calib_rt_cfg)

		iwlagn_send_calib_cfg_rt(priv, priv->hw_params.calib_rt_cfg);



	ieee80211_wake_queues(priv->hw);

	ieee80211_wake_queues(priv->hw);





	priv->active_rate = IWL_RATES_MASK;

	priv->active_rate = IWL_RATES_MASK;