* Change sysctl from using linker_set to construct its tree using SLISTs.

  This makes it possible to change the sysctl tree at runtime.

* Change KLD to find and register any sysctl nodes contained in the loaded
  file and to unregister them when the file is unloaded.

Reviewed by: Archie Cobbs <archie@whistle.com>,
	Peter Wemm <peter@netplex.com.au> (well they looked at it anyway)

9 files changed, 29 insertions, 8 deletions

diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index 7ccbe4b..c19cc35 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: icmp_var.h,v 1.11 1998/12/04 03:49:18 dillon Exp $
+ * $Id: icmp_var.h,v 1.12 1998/12/04 04:21:25 dillon Exp $
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
@@ -78,6 +78,7 @@ struct	icmpstat {
 }
 
 #ifdef KERNEL
+SYSCTL_DECL(_net_inet_icmp);
 #ifdef ICMP_BANDLIM
 extern int badport_bandlim __P((int));
 #endif
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 4f57f64..382b5a4 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.c,v 1.51 1999/01/18 01:54:36 fenner Exp $
+ * $Id: if_ether.c,v 1.52 1999/01/19 23:17:03 fenner Exp $
  */
 
 /*
@@ -45,6 +45,7 @@
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/queue.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -64,6 +65,7 @@
 #define SIN(s) ((struct sockaddr_in *)s)
 #define SDL(s) ((struct sockaddr_dl *)s)
 
+SYSCTL_DECL(_net_link_ether);
 SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, "");
 
 /* timer values */
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 6be729d..9cdbde6 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $Id: igmp_var.h,v 1.11 1997/02/22 09:41:27 peter Exp $
+ * $Id: igmp_var.h,v 1.12 1997/09/07 05:26:37 bde Exp $
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
@@ -104,6 +104,8 @@ void	igmp_slowtimo __P((void));
 	{ "stats", CTLTYPE_STRUCT }, \
 }
 
+SYSCTL_DECL(_net_inet_igmp);
+
 #endif
 
 
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 2976056..083d10b 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- *	$Id: in_proto.c,v 1.46 1998/03/21 11:33:57 peter Exp $
+ *	$Id: in_proto.c,v 1.47 1998/08/23 03:07:14 wollman Exp $
  */
 
 #include "opt_ipdivert.h"
@@ -42,6 +42,7 @@
 #include <sys/socket.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
+#include <sys/queue.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 5db83d0..5fd0a09 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- *	$Id: in_var.h,v 1.28 1998/05/19 14:04:24 dg Exp $
+ *	$Id: in_var.h,v 1.29 1998/06/07 17:12:14 dfr Exp $
  */
 
 #ifndef _NETINET_IN_VAR_H_
@@ -157,6 +157,12 @@ struct in_multi {
 };
 
 #ifdef KERNEL
+
+#ifdef SYSCTL_DECL
+SYSCTL_DECL(_net_inet_ip);
+SYSCTL_DECL(_net_inet_raw);
+#endif
+
 extern LIST_HEAD(in_multihead, in_multi) in_multihead;
 
 /*
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index 4bad5b66..e1dd360 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.c,v 1.102 1998/12/22 20:38:06 luigi Exp $
+ *	$Id: ip_fw.c,v 1.103 1998/12/31 07:43:29 luigi Exp $
  */
 
 /*
@@ -76,6 +76,7 @@ LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain;
 MALLOC_DEFINE(M_IPFW, "IpFw/IpAcct", "IpFw/IpAcct chain's");
 
 #ifdef SYSCTL_NODE
+SYSCTL_DECL(_net_inet_ip);
 SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall");
 SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, &fw_debug, 0, "");
 SYSCTL_INT(_net_inet_ip_fw, OID_AUTO,one_pass,CTLFLAG_RW, &fw_one_pass, 0, "");
diff --git a/sys/netinet/mlf_ipl.c b/sys/netinet/mlf_ipl.c
index 1ef9077..e0082e2 100644
--- a/sys/netinet/mlf_ipl.c
+++ b/sys/netinet/mlf_ipl.c
@@ -84,6 +84,7 @@ extern	int	lkmenodev __P((void));
 int	xxxinit __P((struct lkm_table *, int, int));
 
 #ifdef  SYSCTL_INT
+SYSCTL_DECL(_net_inet);
 SYSCTL_NODE(_net_inet, OID_AUTO, ipf, CTLFLAG_RW, 0, "IPF");
 SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_flags, CTLFLAG_RW, &fr_flags, 0, "");
 SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_pass, CTLFLAG_RW, &fr_pass, 0, "");
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index db4f401..e2c448a 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * 	$Id: tcp_var.h,v 1.48 1998/08/24 07:47:39 dfr Exp $
+ * 	$Id: tcp_var.h,v 1.49 1999/01/20 17:32:00 fenner Exp $
  */
 
 #ifndef _NETINET_TCP_VAR_H_
@@ -322,7 +322,12 @@ struct	xtcpcb {
 	{ "pcblist", CTLTYPE_STRUCT }, \
 }
 
+
 #ifdef KERNEL
+#ifdef SYSCTL_DECL
+SYSCTL_DECL(_net_inet_tcp);
+#endif
+
 extern	struct inpcbhead tcb;		/* head of queue of active tcpcb's */
 extern	struct inpcbinfo tcbinfo;
 extern	struct tcpstat tcpstat;	/* tcp statistics */
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 6fed4bf..2615e9c 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: udp_var.h,v 1.15 1998/05/15 20:11:36 wollman Exp $
+ * $Id: udp_var.h,v 1.16 1998/11/17 10:53:37 dfr Exp $
  */
 
 #ifndef _NETINET_UDP_VAR_H_
@@ -100,6 +100,8 @@ struct	udpstat {
 }
 
 #ifdef KERNEL
+SYSCTL_DECL(_net_inet_udp);
+
 extern struct	pr_usrreqs udp_usrreqs;
 
 void	 udp_ctlinput __P((int, struct sockaddr *, void *));