diff mbox

ath10k: Fix NAPI enable/disable symmetry for AHB interface

Message ID 1490023366-8176-1-git-send-email-mohammed@qca.qualcomm.com (mailing list archive)
State Accepted
Commit a7595a820b07db9ac0d8f479ff62002bdd32a05a
Delegated to: Kalle Valo
Headers show

Commit Message

Mohammed Shafi Shajakhan March 20, 2017, 3:22 p.m. UTC 
From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>

Move NAPI enable to 'ath10k_ahb_hif_start' from
'ath10k_ahb_hif_power_up'. This is to maintain the symmetry
of calling napi_enable() from ath10k_ahb_hif_start() so that it
matches with  napi_disable() being called from ath10k_pci_hif_stop().

This change is based on the crash fix from Kalle for PCI interface in
commit 1427228d5869 ("ath10k: fix napi crash during rmmod when probe
firmware fails").

Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/ahb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo April 5, 2017, 7:34 a.m. UTC | #1 
Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com> wrote:
> From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
> 
> Move NAPI enable to 'ath10k_ahb_hif_start' from
> 'ath10k_ahb_hif_power_up'. This is to maintain the symmetry
> of calling napi_enable() from ath10k_ahb_hif_start() so that it
> matches with  napi_disable() being called from ath10k_pci_hif_stop().
> 
> This change is based on the crash fix from Kalle for PCI interface in
> commit 1427228d5869 ("ath10k: fix napi crash during rmmod when probe
> firmware fails").
> 
> Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>

Patch applied to ath-next branch of ath.git, thanks.

a7595a820b07 ath10k: fix NAPI enable/disable symmetry for AHB interface
diff mbox

Patch

diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c
index 45226db..da770af 100644
--- a/drivers/net/wireless/ath/ath10k/ahb.c
+++ b/drivers/net/wireless/ath/ath10k/ahb.c
@@ -640,6 +640,7 @@  static int ath10k_ahb_hif_start(struct ath10k *ar)
 {
 	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot ahb hif start\n");
 
+	napi_enable(&ar->napi);
 	ath10k_ce_enable_interrupts(ar);
 	ath10k_pci_enable_legacy_irq(ar);
 
@@ -692,7 +693,6 @@  static int ath10k_ahb_hif_power_up(struct ath10k *ar)
 		ath10k_err(ar, "could not wake up target CPU: %d\n", ret);
 		goto err_ce_deinit;
 	}
-	napi_enable(&ar->napi);
 
 	return 0;