diff --git a/[refs] b/[refs] index 860a6d2168a4..263524294dc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 923c6586b0dc0a00df07a1608185437145a0c68b +refs/heads/master: d89cbbb1e69a3bfea38038fb058bd51013902ef3 diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c index 36ff6dc769c6..dd919d84285f 100644 --- a/trunk/net/ipv4/af_inet.c +++ b/trunk/net/ipv4/af_inet.c @@ -1399,13 +1399,7 @@ static __net_initdata struct pernet_operations ipv4_mib_ops = { static int __init init_ipv4_mibs(void) { - if (register_pernet_subsys(&ipv4_mib_ops)) - goto err_net; - - return 0; - -err_net: - return -ENOMEM; + return register_pernet_subsys(&ipv4_mib_ops); } static int ipv4_proc_init(void);