[NET] rules: Use rtnl registration interface

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 6 insertions, 7 deletions

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 7174ced75ef..bf45f24cfea 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -174,7 +174,7 @@ errout:
         return err;
 }
 
-int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
+static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
 {
         struct fib_rule_hdr *frh = nlmsg_data(nlh);
         struct fib_rules_ops *ops = NULL;
@@ -265,7 +265,7 @@ errout:
         return err;
 }
 
-int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
+static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
 {
         struct fib_rule_hdr *frh = nlmsg_data(nlh);
         struct fib_rules_ops *ops = NULL;
@@ -501,6 +501,10 @@ static struct notifier_block fib_rules_notifier = {
 
 static int __init fib_rules_init(void)
 {
+        rtnl_register(PF_UNSPEC, RTM_NEWRULE, fib_nl_newrule, NULL);
+        rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL);
+        rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, rtnl_dump_all);
+
         return register_netdevice_notifier(&fib_rules_notifier);
 }
 
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 3044702f7d9..5cc09f82f6d 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -963,11 +963,6 @@ static struct rtnetlink_link link_rtnetlink_table[RTM_NR_MSGTYPES] =
 {
         [RTM_GETADDR     - RTM_BASE] = { .dumpit = rtnl_dump_all         },
         [RTM_GETROUTE    - RTM_BASE] = { .dumpit = rtnl_dump_all         },
-#ifdef CONFIG_FIB_RULES
-        [RTM_NEWRULE     - RTM_BASE] = { .doit   = fib_nl_newrule        },
-        [RTM_DELRULE     - RTM_BASE] = { .doit   = fib_nl_delrule        },
-#endif
-        [RTM_GETRULE     - RTM_BASE] = { .dumpit = rtnl_dump_all         },
 };
 
 static int rtnetlink_event(struct notifier_block *this, unsigned long event, void *ptr)