[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1419213238-25468-1-git-send-email-baijiaju1990@163.com>
Date: Mon, 22 Dec 2014 09:53:58 +0800
From: Jia-Ju Bai <baijiaju1990@....com>
To: davem@...emloft.net, sergei.shtylyov@...entembedded.com,
netdev@...r.kernel.org
Cc: todd.fujinaka@...el.com, linux.nics@...el.com,
e1000-devel@...ts.sourceforge.net,
Jia-Ju Bai <baijiaju1990@....com>
Subject: [PATCH v3 2/2] e100: Add netif_napi_add 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 e100_probe.
This patch fixes this problem, and it has been tested in runtime.
Signed-off-by: Jia-Ju Bai <baijiaju1990@....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);
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);
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists