Messages in this thread Patch in this message | | | Date | Mon, 23 Jul 2012 02:08:18 +0100 | From | Ben Hutchings <> | Subject | [ 087/108] r8169: call netif_napi_del at errpaths and at driver unload |
| |
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Devendra Naga <devendra.aaru@gmail.com>
commit ad1be8d345416a794dea39761a374032aa471a76 upstream.
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 <devendra.aaru@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- drivers/net/ethernet/realtek/r8169.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4185,6 +4185,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: @@ -4210,6 +4211,8 @@ static void __devexit rtl8169_remove_one cancel_delayed_work_sync(&tp->task); + netif_napi_del(&tp->napi); + unregister_netdev(dev); rtl_release_firmware(tp);
| |