| Message ID | 1419472956-6270-2-git-send-email-baijiaju1990@163.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 25 Dec 2014 10:02:36 +0800 Jia-Ju Bai <baijiaju1990@163.com> wrote: > The driver lacks netif_napi_del in the normal path and error path to > match the call of netif_napi_add in e100_probe. > This patch fixes this problem, and it has been tested on the hardware. > > Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com> > --- > drivers/net/ethernet/intel/e100.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c > index 781065e..21c4d0f 100644 > --- a/drivers/net/ethernet/intel/e100.c > +++ b/drivers/net/ethernet/intel/e100.c > @@ -2985,6 +2985,7 @@ err_out_free_res: > err_out_disable_pdev: > pci_disable_device(pdev); > err_out_free_dev: > + netif_napi_del(&nic->napi); > free_netdev(netdev); This is unnecessary since already done in free_netdev() void free_netdev(struct net_device *dev) { .. list_for_each_entry_safe(p, n, &dev->napi_list, dev_list) netif_napi_del(p); . -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 781065e..21c4d0f 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -2985,6 +2985,7 @@ err_out_free_res: err_out_disable_pdev: pci_disable_device(pdev); err_out_free_dev: + netif_napi_del(&nic->napi); free_netdev(netdev); return err; } @@ -2995,6 +2996,7 @@ static void e100_remove(struct pci_dev *pdev) if (netdev) { struct nic *nic = netdev_priv(netdev); + netif_napi_del(&nic->napi); unregister_netdev(netdev); e100_free(nic); pci_iounmap(pdev, nic->csr);
The driver lacks netif_napi_del in the normal path and error path to match the call of netif_napi_add in e100_probe. This patch fixes this problem, and it has been tested on the hardware. Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com> --- drivers/net/ethernet/intel/e100.c | 2 ++ 1 file changed, 2 insertions(+)