diff options
author | Jia-Ju Bai <baijiaju1990@163.com> | 2014-12-22 08:43:14 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-22 16:31:58 -0500 |
commit | ea3c9e13afe739f1ff31130cea57084cfe8c5dcd (patch) | |
tree | 8e7790309a489a72f3393b58bc615a1b7b898781 /drivers/net | |
parent | 6402a577f4688053e98c1ffda1f4a6a59684ba81 (diff) | |
download | op-kernel-dev-ea3c9e13afe739f1ff31130cea57084cfe8c5dcd.zip op-kernel-dev-ea3c9e13afe739f1ff31130cea57084cfe8c5dcd.tar.gz |
8139too: Add netif_napi_del in the driver
For linux-3.18.0
The driver lacks netif_napi_del in the normal path and error path
to match the call of netif_napi_add in rtl8139_init_one.
This patch fixes this problem.
Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/realtek/8139too.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c index d4b0a29..78bb4ce 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c @@ -1110,6 +1110,7 @@ static int rtl8139_init_one(struct pci_dev *pdev, return 0; err_out: + netif_napi_del(&tp->napi); __rtl8139_cleanup_dev (dev); pci_disable_device (pdev); return i; @@ -1124,6 +1125,7 @@ static void rtl8139_remove_one(struct pci_dev *pdev) assert (dev != NULL); cancel_delayed_work_sync(&tp->thread); + netif_napi_del(&tp->napi); unregister_netdev (dev); |