aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>2008-12-26 01:35:35 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-26 01:35:35 -0800
commitd7b06636be162d3f74c9ce5d6d0d9ea4e5d362c8 (patch)
tree95d9b7b0825f145ba080cb9671bed3b3b189fd16 /net
parent26bc19ecf6c077c926827c25631340fd2e8fb16e (diff)
downloadlinux-2.6.34-ux500-d7b06636be162d3f74c9ce5d6d0d9ea4e5d362c8.tar.gz
net: Init NAPI dev_list on napi_del
The recent GRO patches introduced the NAPI removal of devices in free_netdev. For drivers that can change the number of queues during driver operation, the NAPI infrastructure doesn't allow the freeing and re-addition of NAPI entities without reloading the driver. This change reinitializes the dev_list in each NAPI struct on delete, instead of just deleting it (and assigning the list pointers to POISON). Drivers that wish to remove/re-add NAPI will need to re-initialize the netdev napi_list after removing all NAPI instances, before re-adding NAPI devices again. Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index daca72e6b37..536a8ac189c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2548,7 +2548,7 @@ void netif_napi_del(struct napi_struct *napi)
{
struct sk_buff *skb, *next;
- list_del(&napi->dev_list);
+ list_del_init(&napi->dev_list);
for (skb = napi->gro_list; skb; skb = next) {
next = skb->next;