Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 734b6541 authored by Rustad, Mark D's avatar Rustad, Mark D Committed by David S. Miller
Browse files

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: default avatarMark Rustad <mark.d.rustad@intel.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ab1c24b

net/core/dev.c

+2 −1
Original line number Diff line number Diff line
@@ -6283,6 +6283,7 @@ static struct hlist_head *netdev_create_hash(void) 
/* Initialize per network namespace state */

static int __net_init netdev_init(struct net *net)

{

	if (net != &init_net)

		INIT_LIST_HEAD(&net->dev_base_head);



	net->dev_name_head = netdev_create_hash();

net/core/net_namespace.c

+3 −1
Original line number Diff line number Diff line
@@ -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 */