From c8208f1f14c01ecfb5cd34f33527f3f8e97acf09 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 30 Oct 2009 14:51:13 +0000 Subject: [PATCH] --- yaml --- r: 171106 b: refs/heads/master c: 9fdce099bb72df534daa6193318feaec177998fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 91fb18ee82eb..d7f4e6a3186e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72c9528bab94cc052d00ce241b8e85f5d71e45f0 +refs/heads/master: 9fdce099bb72df534daa6193318feaec177998fc diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index f54d8b8a434b..3c40d545a035 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -5258,6 +5258,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name, netdev_init_queues(dev); INIT_LIST_HEAD(&dev->napi_list); + INIT_LIST_HEAD(&dev->unreg_list); dev->priv_flags = IFF_XMIT_DST_RELEASE; setup(dev); strcpy(dev->name, name); @@ -5339,7 +5340,7 @@ void unregister_netdevice_queue(struct net_device *dev, struct list_head *head) ASSERT_RTNL(); if (head) { - list_add_tail(&dev->unreg_list, head); + list_move_tail(&dev->unreg_list, head); } else { rollback_registered(dev); /* Finish processing unregister after unlock */