From 314ca4c591a285585f43c28b00599e6c98433063 Mon Sep 17 00:00:00 2001
From: "Rustad, Mark D" <mark.d.rustad@intel.com>
Date: Wed, 18 Jul 2012 09:06:07 +0000
Subject: [PATCH] --- yaml --- r: 312088 b: refs/heads/master c:
 734b65417b24d6eea3e3d7457e1f11493890ee1d h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/core/dev.c           | 3 ++-
 trunk/net/core/net_namespace.c | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 156099c415e6..bf75ef2e552d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ab1c24bbd1bae22e0a54beba0cbb12272d940e4
+refs/heads/master: 734b65417b24d6eea3e3d7457e1f11493890ee1d
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 0f28a9e0b8ad..1cb0d8a6aa6c 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/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)
diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c
index dddbacb8f28c..42f1e1c7514f 100644
--- a/trunk/net/core/net_namespace.c
+++ b/trunk/net/core/net_namespace.c
@@ -27,7 +27,9 @@ static DEFINE_MUTEX(net_mutex);
 LIST_HEAD(net_namespace_list);
 EXPORT_SYMBOL_GPL(net_namespace_list);
 
-struct net init_net;
+struct net init_net = {
+	.dev_base_head = LIST_HEAD_INIT(init_net.dev_base_head),
+};
 EXPORT_SYMBOL(init_net);
 
 #define INITIAL_NET_GEN_PTRS	13 /* +1 for len +2 for rcu_head */