Commit ea3c9e13 authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by David S. Miller

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: default avatarJia-Ju Bai <baijiaju1990@163.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6402a577
...@@ -1110,6 +1110,7 @@ static int rtl8139_init_one(struct pci_dev *pdev, ...@@ -1110,6 +1110,7 @@ static int rtl8139_init_one(struct pci_dev *pdev,
return 0; return 0;
err_out: err_out:
netif_napi_del(&tp->napi);
__rtl8139_cleanup_dev (dev); __rtl8139_cleanup_dev (dev);
pci_disable_device (pdev); pci_disable_device (pdev);
return i; return i;
...@@ -1124,6 +1125,7 @@ static void rtl8139_remove_one(struct pci_dev *pdev) ...@@ -1124,6 +1125,7 @@ static void rtl8139_remove_one(struct pci_dev *pdev)
assert (dev != NULL); assert (dev != NULL);
cancel_delayed_work_sync(&tp->thread); cancel_delayed_work_sync(&tp->thread);
netif_napi_del(&tp->napi);
unregister_netdev (dev); unregister_netdev (dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment