nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: Statically initialize init_net.dev_base_head

Browse source 
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>
This commit is contained in:
Rustad, Mark D 2012-07-18 09:06:07 +00:00 committed by David S. Miller
parent 2ab1c24bbd
commit 734b65417b
2 changed files with 5 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
net/core/dev.c
View file

@ -6283,6 +6283,7 @@ static struct hlist_head *netdev_create_hash(void)
/* Initialize per network namespace state */ /* Initialize per network namespace state */
static int __net_init netdev_init(struct net *net) static int __net_init netdev_init(struct net *net)
{ {
if (net != &init_net)
INIT_LIST_HEAD(&net->dev_base_head); INIT_LIST_HEAD(&net->dev_base_head);
net->dev_name_head = netdev_create_hash(); net->dev_name_head = netdev_create_hash();

4
net/core/net_namespace.c
View file

@ -27,7 +27,9 @@ static DEFINE_MUTEX(net_mutex);
LIST_HEAD(net_namespace_list); LIST_HEAD(net_namespace_list);
EXPORT_SYMBOL_GPL(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); EXPORT_SYMBOL(init_net);
#define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */ #define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */