From: Adrian Bunk <bunk@stusta.de>
To: Alan Cox <alan@redhat.com>, Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: netdev@oss.sgi.com, linux-kernel@vger.kernel.org
Subject: [2.6 patch] net/netlink/af_netlink.c: possible cleanups
Date: Wed, 15 Dec 2004 01:46:04 +0100 [thread overview]
Message-ID: <20041215004604.GH23151@stusta.de> (raw)
The patch below contains the following possible cleanups:
- make the needlessly global function netlink_getsockbypid static
- remove the EXPORT_SYMBOL'ed but unused functions netlink_attach and
netlink_detach
Please review whether these changes are correct or whether they conflict
with pending patches.
diffstat output:
include/linux/netlink.h | 3 ---
net/netlink/af_netlink.c | 28 +---------------------------
2 files changed, 1 insertion(+), 30 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc3-mm1-full/include/linux/netlink.h.old 2004-12-14 21:43:16.000000000 +0100
+++ linux-2.6.10-rc3-mm1-full/include/linux/netlink.h 2004-12-14 21:44:27.000000000 +0100
@@ -116,8 +116,6 @@
#define NETLINK_CREDS(skb) (&NETLINK_CB((skb)).creds)
-extern int netlink_attach(int unit, int (*function)(int,struct sk_buff *skb));
-extern void netlink_detach(int unit);
extern int netlink_post(int unit, struct sk_buff *skb);
extern struct sock *netlink_kernel_create(int unit, void (*input)(struct sock *sk, int len));
extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err);
@@ -129,7 +127,6 @@
extern int netlink_unregister_notifier(struct notifier_block *nb);
/* finegrained unicast helpers: */
-struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid);
struct sock *netlink_getsockbyfilp(struct file *filp);
int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, long timeo);
void netlink_detachskb(struct sock *sk, struct sk_buff *skb);
--- linux-2.6.10-rc3-mm1-full/net/netlink/af_netlink.c.old 2004-12-14 21:43:31.000000000 +0100
+++ linux-2.6.10-rc3-mm1-full/net/netlink/af_netlink.c 2004-12-14 21:44:34.000000000 +0100
@@ -546,7 +546,7 @@
}
}
-struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
+static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
{
int protocol = ssk->sk_protocol;
struct sock *sock;
@@ -1210,30 +1210,6 @@
* Backward compatibility.
*/
-int netlink_attach(int unit, int (*function)(int, struct sk_buff *skb))
-{
- struct sock *sk = netlink_kernel_create(unit, NULL);
- if (sk == NULL)
- return -ENOBUFS;
- nlk_sk(sk)->handler = function;
- write_lock_bh(&nl_emu_lock);
- netlink_kernel[unit] = sk->sk_socket;
- write_unlock_bh(&nl_emu_lock);
- return 0;
-}
-
-void netlink_detach(int unit)
-{
- struct socket *sock;
-
- write_lock_bh(&nl_emu_lock);
- sock = netlink_kernel[unit];
- netlink_kernel[unit] = NULL;
- write_unlock_bh(&nl_emu_lock);
-
- sock_release(sock);
-}
-
int netlink_post(int unit, struct sk_buff *skb)
{
struct socket *sock;
@@ -1522,7 +1498,5 @@
EXPORT_SYMBOL(netlink_unregister_notifier);
#if defined(CONFIG_NETLINK_DEV) || defined(CONFIG_NETLINK_DEV_MODULE)
-EXPORT_SYMBOL(netlink_attach);
-EXPORT_SYMBOL(netlink_detach);
EXPORT_SYMBOL(netlink_post);
#endif
next reply other threads:[~2004-12-15 0:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-15 0:46 Adrian Bunk [this message]
2004-12-15 14:07 ` [2.6 patch] net/netlink/af_netlink.c: possible cleanups jamal
2004-12-28 3:08 ` David S. Miller
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=20041215004604.GH23151@stusta.de \
--to=bunk@stusta.de \
--cc=alan@redhat.com \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.com \
/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;
as well as URLs for NNTP newsgroup(s).