summaryrefslogtreecommitdiffstats
path: root/net/netlink
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-01-29 01:41:54 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-01-29 01:41:54 +0000
commitf969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch)
treeb3530d803df59d726afaabebc6626987dee1ca05 /net/netlink
parenta10ce7ef2066b455d69187643ddf2073bfc4db24 (diff)
Merge with 2.3.27.
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/af_netlink.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index b46d1325d..9c472a937 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -967,9 +967,6 @@ struct net_proto_family netlink_family_ops = {
void netlink_proto_init(struct net_proto *pro)
{
-#ifdef CONFIG_PROC_FS
- struct proc_dir_entry *ent;
-#endif
struct sk_buff *dummy_skb;
if (sizeof(struct netlink_skb_parms) > sizeof(dummy_skb->cb)) {
@@ -978,7 +975,6 @@ void netlink_proto_init(struct net_proto *pro)
}
sock_register(&netlink_family_ops);
#ifdef CONFIG_PROC_FS
- ent = create_proc_entry("net/netlink", 0, 0);
- ent->read_proc = netlink_read_proc;
+ create_proc_read_entry("net/netlink", 0, 0, netlink_read_proc, NULL);
#endif
}