Netdev List
 help / color / mirror / Atom feed
From: Thomas Graf <tgraf@suug.ch>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Thomas Graf <tgraf@suug.ch>
Subject: [PATCH 02/12] [NET] link: Use rtnl registration interface
Date: Wed, 21 Mar 2007 01:05:55 +0100	[thread overview]
Message-ID: <20070321000709.464778832@lsx.localdomain> (raw)
In-Reply-To: 20070321000553.070942307@lsx.localdomain

[-- Attachment #1: rtnl_reg_core_convert --]
[-- Type: text/plain, Size: 2122 bytes --]

Signed-off-by: Thomas Graf <tgraf@suug.ch>

Index: net-2.6.22/net/core/rtnetlink.c
===================================================================
--- net-2.6.22.orig/net/core/rtnetlink.c	2007-03-21 00:52:26.000000000 +0100
+++ net-2.6.22/net/core/rtnetlink.c	2007-03-21 00:52:28.000000000 +0100
@@ -537,7 +537,7 @@ nla_put_failure:
 	return -EMSGSIZE;
 }
 
-static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
+static int nl_link_dump(struct sk_buff *skb, struct netlink_callback *cb)
 {
 	int idx;
 	int s_idx = cb->args[0];
@@ -568,7 +568,7 @@ static struct nla_policy ifla_policy[IFL
 	[IFLA_LINKMODE]		= { .type = NLA_U8 },
 };
 
-static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
+static int nl_link_set(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 {
 	struct ifinfomsg *ifm;
 	struct net_device *dev;
@@ -738,7 +738,7 @@ errout:
 	return err;
 }
 
-static int rtnl_getlink(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
+static int nl_link_get(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
 {
 	struct ifinfomsg *ifm;
 	struct nlattr *tb[IFLA_MAX+1];
@@ -960,9 +960,6 @@ static void rtnetlink_rcv(struct sock *s
 
 static struct rtnetlink_link link_rtnetlink_table[RTM_NR_MSGTYPES] =
 {
-	[RTM_GETLINK     - RTM_BASE] = { .doit   = rtnl_getlink,
-					 .dumpit = rtnl_dump_ifinfo	 },
-	[RTM_SETLINK     - RTM_BASE] = { .doit   = rtnl_setlink		 },
 	[RTM_GETADDR     - RTM_BASE] = { .dumpit = rtnl_dump_all	 },
 	[RTM_GETROUTE    - RTM_BASE] = { .dumpit = rtnl_dump_all	 },
 	[RTM_NEWNEIGH    - RTM_BASE] = { .doit   = neigh_add		 },
@@ -1023,8 +1020,9 @@ void __init rtnetlink_init(void)
 		panic("rtnetlink_init: cannot initialize rtnetlink\n");
 	netlink_set_nonroot(NETLINK_ROUTE, NL_NONROOT_RECV);
 	register_netdevice_notifier(&rtnetlink_dev_notifier);
-	rtnetlink_links[PF_UNSPEC] = link_rtnetlink_table;
-	rtnetlink_links[PF_PACKET] = link_rtnetlink_table;
+
+	rtnl_register(PF_UNSPEC, RTM_GETLINK, nl_link_get, nl_link_dump);
+	rtnl_register(PF_UNSPEC, RTM_SETLINK, nl_link_set, NULL);
 }
 
 EXPORT_SYMBOL(__rta_fill);

--


  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 ` Thomas Graf [this message]
2007-03-21  0:05 ` [PATCH 03/12] [NEIGH]: Use rtnl " Thomas Graf
2007-03-21  0:05 ` [PATCH 04/12] [NET] rules: " Thomas Graf
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 02/12] [NET] link: 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.464778832@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