Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 121743
b: refs/heads/master
c: 5d6d480
h: refs/heads/master
i:
  121741: 4560a5e
  121739: d2b0bc0
  121735: 04b9602
  121727: 6f314d0
v: v3
  • Loading branch information
Eric W. Biederman authored and David S. Miller committed Nov 8, 2008
1 parent f615345 commit 7e188be
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3d8160b1493bcadca74fbb635d79b3928b8999cf
refs/heads/master: 5d6d480908300a0c0b3be8b58567dfcef62c83a5
7 changes: 4 additions & 3 deletions trunk/net/core/fib_rules.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 7e188be

Please sign in to comment.