diff options
| author | Devendra Naga <devendra.aaru@gmail.com> | 2012-05-31 01:51:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-01 18:44:32 -0400 |
| commit | ad1be8d345416a794dea39761a374032aa471a76 (patch) | |
| tree | 42b651f2274bf08ec0b611532e29f54bb3e70ebc /drivers/net/ethernet | |
| parent | fff3269907897ee91406ece125795f53e722677e (diff) | |
| download | blackbird-op-linux-ad1be8d345416a794dea39761a374032aa471a76.tar.gz blackbird-op-linux-ad1be8d345416a794dea39761a374032aa471a76.zip | |
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 <devendra.aaru@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 00b4f56a671c..9757ce3543a0 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: |
