2012-05-31 11:51:28

by devendra.aaru

Subject: [PATCH] r8169: call netif_napi_del at errpaths and at driver unload

when register_netdev fails, the init'ed NAPIs by netif_napi_add must be
deleted with netif_napi_del, and also when driver unloads, it should
delete the NAPI before unregistering netdevice using unregister_netdev.

Signed-off-by: Devendra Naga <[email protected]>
---
drivers/net/ethernet/realtek/r8169.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 00b4f56..9757ce3 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -6345,6 +6345,8 @@ static void __devexit rtl_remove_one(struct pci_dev *pdev)

cancel_work_sync(&tp->wk.work);

+ netif_napi_del(&tp->napi);
+
unregister_netdev(dev);

rtl_release_firmware(tp);
@@ -6668,6 +6670,7 @@ out:
return rc;

err_out_msi_4:
+ netif_napi_del(&tp->napi);
rtl_disable_msi(pdev, tp);
iounmap(ioaddr);
err_out_free_res_3:
--
1.7.9.5

2012-06-01 18:25:33

by David Miller

Subject: Re: [PATCH] r8169: call netif_napi_del at errpaths and at driver unload

From: Devendra Naga <[email protected]>
Date: Thu, 31 May 2012 17:21:20 +0530

> when register_netdev fails, the init'ed NAPIs by netif_napi_add must be
> deleted with netif_napi_del, and also when driver unloads, it should
> delete the NAPI before unregistering netdevice using unregister_netdev.
>
> Signed-off-by: Devendra Naga <[email protected]>

Francois, I'm assuming you will merge this to me after you've
done some testing.

2012-06-01 19:38:20

by Francois Romieu

Subject: Re: [PATCH] r8169: call netif_napi_del at errpaths and at driver unload

David Miller <[email protected]> :
[...]
> Francois, I'm assuming you will merge this to me after you've
> done some testing.

You can apply it directly.

I have done several loops both with a forced error patch and the normal
removal of the module without problem. No trivial crash. Four 816x network
adapters. Reference one still comes up.

--
Ueimor

2012-06-01 22:45:00

by David Miller

Subject: Re: [PATCH] r8169: call netif_napi_del at errpaths and at driver unload

From: Francois Romieu <[email protected]>
Date: Fri, 1 Jun 2012 21:29:44 +0200

> David Miller <[email protected]> :
> [...]
>> Francois, I'm assuming you will merge this to me after you've
>> done some testing.
>
> You can apply it directly.
>
> I have done several loops both with a forced error patch and the normal
> removal of the module without problem. No trivial crash. Four 816x network
> adapters. Reference one still comes up.

Ok, applied, thanks.