summaryrefslogtreecommitdiff
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorRustad, Mark D <mark.d.rustad@intel.com>2012-07-18 09:06:07 +0000
committerDavid S. Miller <davem@davemloft.net>2012-07-18 13:32:27 -0700
commit734b65417b24d6eea3e3d7457e1f11493890ee1d (patch)
tree608e36d53d11479bc95fda54cf83931102fc8935 /net/core/dev.c
parent2ab1c24bbd1bae22e0a54beba0cbb12272d940e4 (diff)
downloadlwn-734b65417b24d6eea3e3d7457e1f11493890ee1d.tar.gz
lwn-734b65417b24d6eea3e3d7457e1f11493890ee1d.zip
net: Statically initialize init_net.dev_base_head
This change eliminates an initialization-order hazard most recently seen when netprio_cgroup is built into the kernel. With thanks to Eric Dumazet for catching a bug. Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 0f28a9e0b8ad..1cb0d8a6aa6c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6283,7 +6283,8 @@ static struct hlist_head *netdev_create_hash(void)
/* Initialize per network namespace state */
static int __net_init netdev_init(struct net *net)
{
- INIT_LIST_HEAD(&net->dev_base_head);
+ if (net != &init_net)
+ INIT_LIST_HEAD(&net->dev_base_head);
net->dev_name_head = netdev_create_hash();
if (net->dev_name_head == NULL)