Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v
retrieving revision 1.81.6.2
retrieving revision 1.82
diff -u -p -r1.81.6.2 -r1.82
--- src/sys/netinet/raw_ip.c	2005/03/19 08:36:38	1.81.6.2
+++ src/sys/netinet/raw_ip.c	2005/02/02 21:41:55	1.82
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.81.6.2 2005/03/19 08:36:38 yamt Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.82 2005/02/02 21:41:55 perry Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,14 +61,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.81.6.2 2005/03/19 08:36:38 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.82 2005/02/02 21:41:55 perry Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_mrouting.h"
 
 #include <sys/param.h>
-#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
@@ -123,7 +122,7 @@ void	 rip_disconnect(struct inpcb *);
  * Initialize raw connection block q.
  */
 void
-rip_init(void)
+rip_init()
 {
 
 	in_pcbinit(&rawcbtable, 1, 1);
@@ -237,9 +236,12 @@ rip_input(struct mbuf *m, ...)
 }
 
 int
-rip_pcbnotify(struct inpcbtable *table,
-    struct in_addr faddr, struct in_addr laddr, int proto, int errno,
-    void (*notify)(struct inpcb *, int))
+rip_pcbnotify(table, faddr, laddr, proto, errno, notify)
+	struct inpcbtable *table;
+	struct in_addr faddr, laddr;
+	int proto;
+	int errno;
+	void (*notify)(struct inpcb *, int);
 {
 	struct inpcb *inp, *ninp;
 	int nmatch;
@@ -264,7 +266,10 @@ rip_pcbnotify(struct inpcbtable *table,
 }
 
 void *
-rip_ctlinput(int cmd, struct sockaddr *sa, void *v)
+rip_ctlinput(cmd, sa, v)
+	int cmd;
+	struct sockaddr *sa;
+	void *v;
 {
 	struct ip *ip = v;
 	void (*notify)(struct inpcb *, int) = in_rtchange;
@@ -378,8 +383,11 @@ rip_output(struct mbuf *m, ...)
  * Raw IP socket option processing.
  */
 int
-rip_ctloutput(int op, struct socket *so, int level, int optname,
-    struct mbuf **m)
+rip_ctloutput(op, so, level, optname, m)
+	int op;
+	struct socket *so;
+	int level, optname;
+	struct mbuf **m;
 {
 	struct inpcb *inp = sotoinpcb(so);
 	int error = 0;
@@ -454,7 +462,9 @@ rip_ctloutput(int op, struct socket *so,
 }
 
 int
-rip_bind(struct inpcb *inp, struct mbuf *nam)
+rip_bind(inp, nam)
+	struct inpcb *inp;
+	struct mbuf *nam;
 {
 	struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
 
@@ -473,7 +483,9 @@ rip_bind(struct inpcb *inp, struct mbuf 
 }
 
 int
-rip_connect(struct inpcb *inp, struct mbuf *nam)
+rip_connect(inp, nam)
+	struct inpcb *inp;
+	struct mbuf *nam;
 {
 	struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
 
@@ -489,7 +501,8 @@ rip_connect(struct inpcb *inp, struct mb
 }
 
 void
-rip_disconnect(struct inpcb *inp)
+rip_disconnect(inp)
+	struct inpcb *inp;
 {
 
 	inp->inp_faddr = zeroin_addr;
@@ -500,8 +513,11 @@ u_long	rip_recvspace = RIPRCVQ;
 
 /*ARGSUSED*/
 int
-rip_usrreq(struct socket *so, int req,
-    struct mbuf *m, struct mbuf *nam, struct mbuf *control, struct proc *p)
+rip_usrreq(so, req, m, nam, control, p)
+	struct socket *so;
+	int req;
+	struct mbuf *m, *nam, *control;
+	struct proc *p;
 {
 	struct inpcb *inp;
 	int s;
@@ -666,32 +682,3 @@ release:
 	splx(s);
 	return (error);
 }
-
-SYSCTL_SETUP(sysctl_net_inet_raw_setup, "sysctl net.inet.raw subtree setup")
-{
-
-	sysctl_createv(clog, 0, NULL, NULL,
-		       CTLFLAG_PERMANENT,
-		       CTLTYPE_NODE, "net", NULL,
-		       NULL, 0, NULL, 0,
-		       CTL_NET, CTL_EOL);
-	sysctl_createv(clog, 0, NULL, NULL,
-		       CTLFLAG_PERMANENT,
-		       CTLTYPE_NODE, "inet", NULL,
-		       NULL, 0, NULL, 0,
-		       CTL_NET, PF_INET, CTL_EOL);
-	sysctl_createv(clog, 0, NULL, NULL,
-		       CTLFLAG_PERMANENT,
-		       CTLTYPE_NODE, "raw",
-		       SYSCTL_DESCR("Raw IPv4 settings"),
-		       NULL, 0, NULL, 0,
-		       CTL_NET, PF_INET, IPPROTO_RAW, CTL_EOL);
-
-	sysctl_createv(clog, 0, NULL, NULL,
-		       CTLFLAG_PERMANENT,
-		       CTLTYPE_STRUCT, "pcblist",
-		       SYSCTL_DESCR("Raw IPv4 control block list"),
-		       sysctl_inpcblist, 0, &rawcbtable, 0,
-		       CTL_NET, PF_INET, IPPROTO_RAW,
-		       CTL_CREATE, CTL_EOL);
-}