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

Commit 349ac7ea authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ath10k: Fix crash when SSR is done during packet transfer"

parents f6f01239 6079be74

drivers/net/wireless/ath/ath10k/qmi.c

+0 −1
Original line number Diff line number Diff line
@@ -854,7 +854,6 @@ int ath10k_snoc_start_qmi_service(struct ath10k *ar) 
		goto out_destroy_wq;

	}



	atomic_set(&qmi_cfg->fw_ready, 1);

	ath10k_dbg(ar, ATH10K_DBG_SNOC, "QMI service started successfully\n");

	return 0;

drivers/net/wireless/ath/ath10k/qmi.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define ATH10K_SNOC_WLAN_FW_READY_TIMEOUT	8000



#define WLFW_SERVICE_INS_ID_V01		0

#define WLFW_CLIENT_ID			0x4b4e454c

#define WLFW_CLIENT_ID			0x41544851

#define WLFW_TIMEOUT_MS			20000



enum ath10k_snoc_driver_event_type {

drivers/net/wireless/ath/ath10k/snoc.c

+3 −0
Original line number Diff line number Diff line
@@ -650,6 +650,9 @@ static int ath10k_snoc_hif_tx_sg(struct ath10k *ar, u8 pipe_id, 
	if (!ar_snoc)

		return  -EINVAL;



	if (atomic_read(&ar_snoc->fw_crashed))

		return -ESHUTDOWN;



	snoc_pipe = &ar_snoc->pipe_info[pipe_id];

	ce_pipe = snoc_pipe->ce_hdl;

	src_ring = ce_pipe->src_ring;