patch-2.4.1 linux/net/unix/sysctl_net_unix.c

Next file: linux/net/x25/Makefile
Previous file: linux/net/unix/af_unix.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0/linux/net/unix/sysctl_net_unix.c linux/net/unix/sysctl_net_unix.c
@@ -1,10 +1,8 @@
 /*
- * NET3:	Sysctl interface to net af_unix subsystem.
+ * NET4:	Sysctl interface to net af_unix subsystem.
  *
  * Authors:	Mike Shaver.
  *
- *		Added /proc/sys/net/unix directory entry (empty =) ).
- *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License
  *		as published by the Free Software Foundation; either version
@@ -13,9 +11,6 @@
 
 #include <linux/mm.h>
 #include <linux/sysctl.h>
-#include <linux/config.h>
-
-#ifdef CONFIG_SYSCTL
 
 extern int sysctl_unix_max_dgram_qlen;
 
@@ -26,20 +21,18 @@
 	{0}
 };
 
-static struct ctl_table_header * unix_sysctl_header;
-static struct ctl_table unix_root_table[];
-static struct ctl_table unix_net_table[];
-
-ctl_table unix_root_table[] = {
-	{CTL_NET, "net", NULL, 0, 0555, unix_net_table},
+static ctl_table unix_net_table[] = {
+	{NET_UNIX, "unix", NULL, 0, 0555, unix_table},
 	{0}
 };
 
-ctl_table unix_net_table[] = {
-	{NET_UNIX, "unix", NULL, 0, 0555, unix_table},
+static ctl_table unix_root_table[] = {
+	{CTL_NET, "net", NULL, 0, 0555, unix_net_table},
 	{0}
 };
 
+static struct ctl_table_header * unix_sysctl_header;
+
 void unix_sysctl_register(void)
 {
 	unix_sysctl_header = register_sysctl_table(unix_root_table, 0);
@@ -50,4 +43,3 @@
 	unregister_sysctl_table(unix_sysctl_header);
 }
 
-#endif	/* CONFIG_SYSCTL */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)