diff options
| author | Rustad, Mark D <mark.d.rustad@intel.com> | 2012-07-18 09:06:07 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-10-10 03:31:09 +0100 |
| commit | 954f835261b3a2d029b17eaf1e52155ce4d93be4 (patch) | |
| tree | 926b0277b214d7fbe2c0d64e1c82c40da51cdf3c /net/core/dev.c | |
| parent | f4df2d0a5fcfa5e9bb7d9de7dc634e43cf120285 (diff) | |
net: Statically initialize init_net.dev_base_head
commit 734b65417b24d6eea3e3d7457e1f11493890ee1d upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 832ba6d346a..87159383485 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6387,7 +6387,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) |