| Message ID | 20180920050426.4113-1-govinds@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 752ed2a229c62f9301b9ab91d04048402fab6ff8 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [1/2] ath10k: Move napi_enable to hif_start for consistent pairing | expand |
Govind Singh <govinds@codeaurora.org> wrote: > There is unbalanced napi_{enable,disable}() behavior as they > are being called from hif_snoc_{power_up/stop). > > The fix is to call napi_enable() from ath10k_snoc_hif_start() > so that it matches with napi_disable() being called from > ath10k_snoc_hif_stop(). > > Signed-off-by: Govind Singh <govinds@codeaurora.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> 2 patches applied to ath-next branch of ath.git, thanks. 752ed2a229c6 ath10k: move napi_enable to hif_start for consistent pairing 393b9b0f830e ath10k: disable napi before resource cleanup to avoid "use after free"
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index ed52a6308f76..dd043b858c8e 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -919,6 +919,7 @@ static void ath10k_snoc_hif_stop(struct ath10k *ar) static int ath10k_snoc_hif_start(struct ath10k *ar) { + napi_enable(&ar->napi); ath10k_snoc_irq_enable(ar); ath10k_snoc_rx_post(ar); @@ -1017,7 +1018,6 @@ static int ath10k_snoc_hif_power_up(struct ath10k *ar) goto err_wlan_enable; } - napi_enable(&ar->napi); return 0; err_wlan_enable:
There is unbalanced napi_{enable,disable}() behavior as they are being called from hif_snoc_{power_up/stop). The fix is to call napi_enable() from ath10k_snoc_hif_start() so that it matches with napi_disable() being called from ath10k_snoc_hif_stop(). Signed-off-by: Govind Singh <govinds@codeaurora.org> --- drivers/net/wireless/ath/ath10k/snoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)