summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-12-24 16:19:56 -0800
committerDavid S. Miller <davem@davemloft.net>2018-12-24 16:19:56 -0800
commit90cadbbf341dd5b2df991c33a6bd6341f3a53788 (patch)
tree306a7e88725865b7310fa5b0962336f98a8214fe /net/core
parentc92c81df93df95dafbf6926613ce0b436227b007 (diff)
parent38355a5f9a22bfa5bd5b1bb79805aca39fa53729 (diff)
downloadlinux-90cadbbf341dd5b2df991c33a6bd6341f3a53788.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in bug fixes before respinning my net-next pull request. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/net_namespace.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 05b23b285058..b02fb19df2cc 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -1024,7 +1024,8 @@ static int __init net_ns_init(void)
init_net_initialized = true;
up_write(&pernet_ops_rwsem);
- register_pernet_subsys(&net_ns_ops);
+ if (register_pernet_subsys(&net_ns_ops))
+ panic("Could not register network namespace subsystems");
rtnl_register(PF_UNSPEC, RTM_NEWNSID, rtnl_net_newid, NULL,
RTNL_FLAG_DOIT_UNLOCKED);