diff --git a/[refs] b/[refs] index 8b5c36902560..b22b3666b923 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 214f45c91bbda8321d9676f1197238e4663edcbb +refs/heads/master: f87e6f47933e3ebeced9bb12615e830a72cedce4 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 8e726cb47ed7..a18c1643ea9f 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1280,10 +1280,13 @@ static int __dev_close_many(struct list_head *head) static int __dev_close(struct net_device *dev) { + int retval; LIST_HEAD(single); list_add(&dev->unreg_list, &single); - return __dev_close_many(&single); + retval = __dev_close_many(&single); + list_del(&single); + return retval; } int dev_close_many(struct list_head *head) @@ -1325,7 +1328,7 @@ int dev_close(struct net_device *dev) list_add(&dev->unreg_list, &single); dev_close_many(&single); - + list_del(&single); return 0; } EXPORT_SYMBOL(dev_close);