net sysctl: Initialize the network sysctls sooner to avoid problems.
authorEric W. Biederman <ebiederm@xmission.com>
Thu, 19 Apr 2012 13:20:32 +0000 (13:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Apr 2012 01:21:16 +0000 (21:21 -0400)
If the netfilter code is modified to use register_net_sysctl_table the
kernel fails to boot because the per net sysctl infrasturce is not setup
soon enough.  So to avoid races call net_sysctl_init from sock_init().

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/net_namespace.h
net/socket.c
net/sysctl_net.c

Simple merge
diff --cc net/socket.c
Simple merge
Simple merge