6 files changed, 19 insertions, 16 deletions
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index cd83411..83ec444 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_icmp.c,v 1.15 1995/12/08 16:46:06 wollman Exp $
+ * $Id: ip_icmp.c,v 1.16 1995/12/14 09:53:40 phk Exp $
  */
 
 #include <sys/param.h>
@@ -194,7 +194,7 @@ icmp_input(m, hlen)
 	int icmplen = ip->ip_len;
 	register int i;
 	struct in_ifaddr *ia;
-	void (*ctlfunc) __P((int, struct sockaddr *, caddr_t));
+	void (*ctlfunc) __P((int, struct sockaddr *, void *));
 	int code;
 
 	/*
@@ -357,7 +357,7 @@ icmp_input(m, hlen)
 		ctlfunc = inetsw[ip_protox[icp->icmp_ip.ip_p]].pr_ctlinput;
 		if (ctlfunc)
 			(*ctlfunc)(code, (struct sockaddr *)&icmpsrc,
-			    (caddr_t)&icp->icmp_ip);
+				   (void *)&icp->icmp_ip);
 		break;
 
 	badcode:
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 7520d1b..c41e84c 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.22 1995/11/14 20:34:41 phk Exp $
+ *	$Id: tcp_subr.c,v 1.23 1995/12/05 17:46:43 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -444,11 +444,12 @@ tcp_notify(inp, error)
 }
 
 void
-tcp_ctlinput(cmd, sa, ip)
+tcp_ctlinput(cmd, sa, vip)
 	int cmd;
 	struct sockaddr *sa;
-	register struct ip *ip;
+	void *vip;
 {
+	register struct ip *ip = vip;
 	register struct tcphdr *th;
 	void (*notify) __P((struct inpcb *, int)) = tcp_notify;
 
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 7520d1b..c41e84c 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.22 1995/11/14 20:34:41 phk Exp $
+ *	$Id: tcp_subr.c,v 1.23 1995/12/05 17:46:43 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -444,11 +444,12 @@ tcp_notify(inp, error)
 }
 
 void
-tcp_ctlinput(cmd, sa, ip)
+tcp_ctlinput(cmd, sa, vip)
 	int cmd;
 	struct sockaddr *sa;
-	register struct ip *ip;
+	void *vip;
 {
+	register struct ip *ip = vip;
 	register struct tcphdr *th;
 	void (*notify) __P((struct inpcb *, int)) = tcp_notify;
 
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 706cf9f..2b2e548 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.23 1995/11/14 20:34:50 phk Exp $
+ * 	$Id: tcp_var.h,v 1.24 1995/12/05 17:46:50 wollman Exp $
  */
 
 #ifndef _NETINET_TCP_VAR_H_
@@ -332,7 +332,7 @@ extern  u_short tcp_lastport;	/* last assigned port */
 void	 tcp_canceltimers __P((struct tcpcb *));
 struct tcpcb *
 	 tcp_close __P((struct tcpcb *));
-void	 tcp_ctlinput __P((int, struct sockaddr *, struct ip *));
+void	 tcp_ctlinput __P((int, struct sockaddr *, void *));
 int	 tcp_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
 struct tcpcb *
 	 tcp_drop __P((struct tcpcb *, int));
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 807a147..301c088 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- *	$Id: udp_usrreq.c,v 1.17 1995/12/06 23:37:44 bde Exp $
+ *	$Id: udp_usrreq.c,v 1.18 1995/12/14 09:53:49 phk Exp $
  */
 
 #include <sys/param.h>
@@ -373,11 +373,12 @@ udp_notify(inp, errno)
 }
 
 void
-udp_ctlinput(cmd, sa, ip)
+udp_ctlinput(cmd, sa, vip)
 	int cmd;
 	struct sockaddr *sa;
-	register struct ip *ip;
+	void *vip;
 {
+	register struct ip *ip = vip;
 	register struct udphdr *uh;
 
 	if (!PRC_IS_REDIRECT(cmd) &&
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 8b4d0fc..0c24818 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.6 1995/11/14 20:34:56 phk Exp $
+ * $Id: udp_var.h,v 1.7 1995/11/16 09:51:07 bde Exp $
  */
 
 #ifndef _NETINET_UDP_VAR_H_
@@ -92,7 +92,7 @@ extern struct	inpcbhead udb;
 extern struct	inpcbinfo udbinfo;
 extern struct	udpstat udpstat;
 
-void	 udp_ctlinput __P((int, struct sockaddr *, struct ip *));
+void	 udp_ctlinput __P((int, struct sockaddr *, void *));
 void	 udp_init __P((void));
 void	 udp_input __P((struct mbuf *, int));
 int	 udp_usrreq __P((struct socket *,