summaryrefslogtreecommitdiffstats
path: root/net/packet
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
commit33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch)
tree2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /net/packet
parent216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff)
Merge with Linux 2.3.32.
Diffstat (limited to 'net/packet')
-rw-r--r--net/packet/af_packet.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 48c9578e3..0e6617c1f 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1852,14 +1852,10 @@ int init_module(void)
void __init packet_proto_init(struct net_proto *pro)
#endif
{
-#ifdef CONFIG_PROC_FS
- struct proc_dir_entry *ent;
-#endif
sock_register(&packet_family_ops);
register_netdevice_notifier(&packet_netdev_notifier);
#ifdef CONFIG_PROC_FS
- ent = create_proc_entry("net/packet", 0, 0);
- ent->read_proc = packet_read_proc;
+ create_proc_read_entry("net/packet", 0, 0, packet_read_proc, NULL);
#endif
#ifdef MODULE
return 0;