[NET] rules: Use rtnl registration interface

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

diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index d585ea9fa97d3887435e064922f5e65a62748851..b2b9ccdf32d649bee0d7a76763c0cdca480d74e7 100644 (file)
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -5,7 +5,7 @@
 #include <linux/netdevice.h>
 #include <linux/fib_rules.h>
 #include <net/flow.h>
-#include <net/netlink.h>
+#include <net/rtnetlink.h>
 
 struct fib_rule
 {
@@ -99,10 +99,6 @@ extern int                   fib_rules_lookup(struct fib_rules_ops *,
                                                 struct flowi *, int flags,
                                                 struct fib_lookup_arg *);
 
-extern int                     fib_nl_newrule(struct sk_buff *,
-                                              struct nlmsghdr *, void *);
-extern int                     fib_nl_delrule(struct sk_buff *,
-                                              struct nlmsghdr *, void *);
 extern int                     fib_rules_dump(struct sk_buff *,
                                               struct netlink_callback *, int);
 #endif

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 7174ced75efcc99e6665f154407f758cfd313859..bf45f24cfea2c4f3c20a8b28114e1c7bf3df523a 100644 (file)
--- 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 3044702f7d9b731148728ad8c132c72c513591a0..5cc09f82f6d62fbc1ba36f2418a4c27171adeace 100644 (file)
--- 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)