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

Commit 1103323c authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: pcie: cancel Tx timer upon firmware crash 



When the firmware crashes, we can't expect the Tx queues to
progress. Cancel their timer.

Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 5bf12f60

drivers/net/wireless/iwlwifi/pcie/rx.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1014,6 +1014,7 @@ static void iwl_pcie_rx_handle(struct iwl_trans *trans) 
static void iwl_pcie_irq_handle_error(struct iwl_trans *trans)

static void iwl_pcie_irq_handle_error(struct iwl_trans *trans)

{

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	int i;





	/* W/A for WiFi/WiMAX coex and WiMAX own the RF */

	/* W/A for WiFi/WiMAX coex and WiMAX own the RF */

	if (trans->cfg->internal_wimax_coex &&

	if (trans->cfg->internal_wimax_coex &&
@@ -1037,6 +1038,9 @@ static void iwl_pcie_irq_handle_error(struct iwl_trans *trans) 
	iwl_trans_fw_error(trans);

	iwl_trans_fw_error(trans);

	local_bh_enable();

	local_bh_enable();





	for (i = 0; i < trans->cfg->base_params->num_of_queues; i++)

		del_timer(&trans_pcie->txq[i].stuck_timer);



	clear_bit(STATUS_SYNC_HCMD_ACTIVE, &trans->status);

	clear_bit(STATUS_SYNC_HCMD_ACTIVE, &trans->status);

	wake_up(&trans_pcie->wait_command_queue);

	wake_up(&trans_pcie->wait_command_queue);

}

}