From 7e188be79b2cb3106c7a5372c6cb341a454a66bc Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 7 Nov 2008 22:52:34 -0800 Subject: [PATCH] --- yaml --- r: 121743 b: refs/heads/master c: 5d6d480908300a0c0b3be8b58567dfcef62c83a5 h: refs/heads/master i: 121741: 4560a5e5b8510166f1bfc7d513741db0999758e4 121739: d2b0bc0db4aa6a69b67ea34e23d5b6900a7a9025 121735: 04b9602652555360ec49bc6981b634035483f86e 121727: 6f314d01812c37851a1854d78f84f147db4030c0 v: v3 --- [refs] | 2 +- trunk/net/core/fib_rules.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 32c758dd1d19..2bf49343c15f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d8160b1493bcadca74fbb635d79b3928b8999cf +refs/heads/master: 5d6d480908300a0c0b3be8b58567dfcef62c83a5 diff --git a/trunk/net/core/fib_rules.c b/trunk/net/core/fib_rules.c index 79de3b14a8d1..32b3a0152d7a 100644 --- a/trunk/net/core/fib_rules.c +++ b/trunk/net/core/fib_rules.c @@ -664,17 +664,18 @@ static int __init fib_rules_init(void) rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL); rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule); - err = register_netdevice_notifier(&fib_rules_notifier); + err = register_pernet_subsys(&fib_rules_net_ops); if (err < 0) goto fail; - err = register_pernet_subsys(&fib_rules_net_ops); + err = register_netdevice_notifier(&fib_rules_notifier); if (err < 0) goto fail_unregister; + return 0; fail_unregister: - unregister_netdevice_notifier(&fib_rules_notifier); + unregister_pernet_subsys(&fib_rules_net_ops); fail: rtnl_unregister(PF_UNSPEC, RTM_NEWRULE); rtnl_unregister(PF_UNSPEC, RTM_DELRULE);