From d4d6391e625d97eb37b0453e0a0fa7b5b397796b Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 17 Feb 2011 22:59:19 +0000 Subject: [PATCH] --- yaml --- r: 233453 b: refs/heads/master c: ceaaec98ad99859ac90ac6863ad0a6cd075d8e0e h: refs/heads/master i: 233451: 9554220740a6f372ff9e7b7dd073b92795f87073 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b22b3666b923..7382ee9ca09b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f87e6f47933e3ebeced9bb12615e830a72cedce4 +refs/heads/master: ceaaec98ad99859ac90ac6863ad0a6cd075d8e0e diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index a18c1643ea9f..8ae6631abcc2 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -5066,6 +5066,7 @@ static void rollback_registered(struct net_device *dev) list_add(&dev->unreg_list, &single); rollback_registered_many(&single); + list_del(&single); } unsigned long netdev_fix_features(unsigned long features, const char *name) @@ -6219,6 +6220,7 @@ static void __net_exit default_device_exit_batch(struct list_head *net_list) } } unregister_netdevice_many(&dev_kill_list); + list_del(&dev_kill_list); rtnl_unlock(); }