From: Thomas Graf <tgraf@suug.ch>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Thomas Graf <tgraf@suug.ch>
Subject: [PATCH 04/12] [NET] rules: Use rtnl registration interface
Date: Wed, 21 Mar 2007 01:05:57 +0100 [thread overview]
Message-ID: <20070321000709.729911383@lsx.localdomain> (raw)
In-Reply-To: 20070321000553.070942307@lsx.localdomain
[-- Attachment #1: rtnl_reg_rules_convert --]
[-- Type: text/plain, Size: 2862 bytes --]
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Index: net-2.6.22/net/core/fib_rules.c
===================================================================
--- net-2.6.22.orig/net/core/fib_rules.c 2007-03-20 23:53:21.000000000 +0100
+++ net-2.6.22/net/core/fib_rules.c 2007-03-21 00:52:30.000000000 +0100
@@ -152,7 +152,7 @@ out:
EXPORT_SYMBOL_GPL(fib_rules_lookup);
-int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
+static int nl_rule_new(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
{
struct fib_rule_hdr *frh = nlmsg_data(nlh);
struct fib_rules_ops *ops = NULL;
@@ -239,7 +239,7 @@ errout:
return err;
}
-int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
+static int nl_rule_del(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
{
struct fib_rule_hdr *frh = nlmsg_data(nlh);
struct fib_rules_ops *ops = NULL;
@@ -471,6 +471,10 @@ static struct notifier_block fib_rules_n
static int __init fib_rules_init(void)
{
+ rtnl_register(PF_UNSPEC, RTM_NEWRULE, nl_rule_new, NULL);
+ rtnl_register(PF_UNSPEC, RTM_DELRULE, nl_rule_del, NULL);
+ rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, rtnl_dump_all);
+
return register_netdevice_notifier(&fib_rules_notifier);
}
Index: net-2.6.22/include/net/fib_rules.h
===================================================================
--- net-2.6.22.orig/include/net/fib_rules.h 2007-03-20 23:53:21.000000000 +0100
+++ net-2.6.22/include/net/fib_rules.h 2007-03-21 00:52:30.000000000 +0100
@@ -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
{
@@ -98,10 +98,6 @@ extern int fib_rules_lookup(struct fib
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
Index: net-2.6.22/net/core/rtnetlink.c
===================================================================
--- net-2.6.22.orig/net/core/rtnetlink.c 2007-03-21 00:52:29.000000000 +0100
+++ net-2.6.22/net/core/rtnetlink.c 2007-03-21 00:52:30.000000000 +0100
@@ -962,11 +962,6 @@ static struct rtnetlink_link link_rtnetl
{
[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)
--
next prev parent reply other threads:[~2007-03-21 0:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-21 0:05 [PATCH 00/12] [PATCHSET] RTNetlink message handler registration interface Thomas Graf
2007-03-21 0:05 ` [PATCH 01/12] [RTNL]: Message " Thomas Graf
2007-03-21 0:05 ` [PATCH 02/12] [NET] link: Use rtnl " Thomas Graf
2007-03-21 0:05 ` [PATCH 03/12] [NEIGH]: " Thomas Graf
2007-03-21 0:05 ` Thomas Graf [this message]
2007-03-21 0:05 ` [PATCH 05/12] [IPv4]: " Thomas Graf
2007-03-21 0:05 ` [PATCH 06/12] [PKT_SCHED] qdisc: " Thomas Graf
2007-03-21 0:06 ` [PATCH 07/12] [PKT_SCHED] cls: " Thomas Graf
2007-03-21 0:06 ` [PATCH 08/12] [PKT_SCHED] act: " Thomas Graf
2007-03-21 0:06 ` [PATCH 09/12] [DECNet]: " Thomas Graf
2007-03-21 0:06 ` [PATCH 10/12] [IPv6]: " Thomas Graf
2007-03-21 1:01 ` YOSHIFUJI Hideaki / 吉藤英明
2007-03-21 12:43 ` Thomas Graf
2007-03-21 0:06 ` [PATCH 11/12] [BRIDGE]: " Thomas Graf
2007-03-21 0:06 ` [PATCH 12/12] [RTNL]: Use rtnl registration interface for dump-all aliases Thomas Graf
-- strict thread matches above, loose matches on Subject: below --
2007-03-22 12:59 [PATCH 00/12] [RESEND] rtnetlink message handler registration interface Thomas Graf
2007-03-22 12:59 ` [PATCH 04/12] [NET] rules: Use rtnl " Thomas Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070321000709.729911383@lsx.localdomain \
--to=tgraf@suug.ch \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox