diff options
| author | Rustad, Mark D <mark.d.rustad@intel.com> | 2012-07-18 09:06:07 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 09:47:41 -0700 |
| commit | b64295e8b4d340a136f02f08baffa9efc0f2e0bc (patch) | |
| tree | 9cf063786b5805e433b5292ca68bb2cb62fcc657 /net/core/dev.c | |
| parent | 41ed10ac178bd4caed55434e43cb797602da93fc (diff) | |
| download | kernel_samsung_aries-b64295e8b4d340a136f02f08baffa9efc0f2e0bc.zip kernel_samsung_aries-b64295e8b4d340a136f02f08baffa9efc0f2e0bc.tar.gz kernel_samsung_aries-b64295e8b4d340a136f02f08baffa9efc0f2e0bc.tar.bz2 | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 6b43ec6..d8bc889 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6260,7 +6260,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) |