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
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/raw_ip.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.94
retrieving revision 1.94.4.2
diff -u -p -r1.94 -r1.94.4.2
--- src/sys/netinet/raw_ip.c	2006/10/25 22:49:23	1.94
+++ src/sys/netinet/raw_ip.c	2007/03/12 05:59:38	1.94.4.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.94 2006/10/25 22:49:23 elad Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.94.4.2 2007/03/12 05:59:38 rmind Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.94 2006/10/25 22:49:23 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.94.4.2 2007/03/12 05:59:38 rmind Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -157,7 +157,7 @@ rip_input(struct mbuf *m, ...)
 	ripsrc.sin_len = sizeof(struct sockaddr_in);
 	ripsrc.sin_addr = ip->ip_src;
 	ripsrc.sin_port = 0;
-	bzero((caddr_t)ripsrc.sin_zero, sizeof(ripsrc.sin_zero));
+	bzero((void *)ripsrc.sin_zero, sizeof(ripsrc.sin_zero));
 
 	/*
 	 * XXX Compatibility: programs using raw IP expect ip_len
@@ -266,7 +266,7 @@ rip_pcbnotify(struct inpcbtable *table,
 }
 
 void *
-rip_ctlinput(int cmd, struct sockaddr *sa, void *v)
+rip_ctlinput(int cmd, const struct sockaddr *sa, void *v)
 {
 	struct ip *ip = v;
 	void (*notify)(struct inpcb *, int) = in_rtchange;
@@ -285,12 +285,12 @@ rip_ctlinput(int cmd, struct sockaddr *s
 	else if (errno == 0)
 		return NULL;
 	if (ip) {
-		rip_pcbnotify(&rawcbtable, satosin(sa)->sin_addr,
+		rip_pcbnotify(&rawcbtable, satocsin(sa)->sin_addr,
 		    ip->ip_src, ip->ip_p, errno, notify);
 
 		/* XXX mapped address case */
 	} else
-		in_pcbnotifyall(&rawcbtable, satosin(sa)->sin_addr, errno,
+		in_pcbnotifyall(&rawcbtable, satocsin(sa)->sin_addr, errno,
 		    notify);
 	return NULL;
 }
@@ -513,7 +513,7 @@ rip_usrreq(struct socket *so, int req,
 #endif
 
 	if (req == PRU_CONTROL)
-		return (in_control(so, (long)m, (caddr_t)nam,
+		return (in_control(so, (long)m, (void *)nam,
 		    (struct ifnet *)control, l));
 
 	s = splsoftnet();