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

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

Merge "wil6210: fix no_fw_recovery mode with change_virtual_intf"

parents 4f2bef2c f39d5f16

drivers/net/wireless/ath/wil6210/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int wil_cfg80211_change_iface(struct wiphy *wiphy, 


	wil_dbg_misc(wil, "%s() type=%d\n", __func__, type);



	if (netif_running(wil_to_ndev(wil))) {

	if (netif_running(wil_to_ndev(wil)) && !wil_is_recovery_blocked(wil)) {

		wil_dbg_misc(wil, "interface is up. resetting...\n");

		mutex_lock(&wil->mutex);

		__wil_down(wil);

drivers/net/wireless/ath/wil6210/interrupt.c

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ static irqreturn_t wil6210_irq_misc_thread(int irq, void *cookie) 
	wil_dbg_irq(wil, "Thread ISR MISC 0x%08x\n", isr);



	if (isr & ISR_MISC_FW_ERROR) {

		wil->recovery_state = fw_recovery_pending;

		wil_fw_core_dump(wil);

		wil_notify_fw_error(wil);

		isr &= ~ISR_MISC_FW_ERROR;

drivers/net/wireless/ath/wil6210/main.c

+5 −0
Original line number Diff line number Diff line
@@ -305,6 +305,11 @@ void wil_set_recovery_state(struct wil6210_priv *wil, int state) 
	wake_up_interruptible(&wil->wq);

}



bool wil_is_recovery_blocked(struct wil6210_priv *wil)

{

	return no_fw_recovery && (wil->recovery_state == fw_recovery_pending);

}



static void wil_fw_error_worker(struct work_struct *work)

{

	struct wil6210_priv *wil = container_of(work, struct wil6210_priv,

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −0
Original line number Diff line number Diff line
@@ -712,6 +712,7 @@ void wil_priv_deinit(struct wil6210_priv *wil); 
int wil_reset(struct wil6210_priv *wil, bool no_fw);

void wil_fw_error_recovery(struct wil6210_priv *wil);

void wil_set_recovery_state(struct wil6210_priv *wil, int state);

bool wil_is_recovery_blocked(struct wil6210_priv *wil);

int wil_up(struct wil6210_priv *wil);

int __wil_up(struct wil6210_priv *wil);

int wil_down(struct wil6210_priv *wil);