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/in_gif.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/in_gif.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.54
retrieving revision 1.54.2.2
diff -u -p -r1.54 -r1.54.2.2
--- src/sys/netinet/in_gif.c	2007/02/17 05:31:39	1.54
+++ src/sys/netinet/in_gif.c	2007/03/12 05:59:36	1.54.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_gif.c,v 1.54 2007/02/17 05:31:39 dyoung Exp $	*/
+/*	$NetBSD: in_gif.c,v 1.54.2.2 2007/03/12 05:59:36 rmind Exp $	*/
 /*	$KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.54 2007/02/17 05:31:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.54.2.2 2007/03/12 05:59:36 rmind Exp $");
 
 #include "opt_inet.h"
 #include "opt_iso.h"
@@ -368,7 +368,7 @@ gif_encapcheck4(struct mbuf *m, int off,
 	/* sanity check done in caller */
 	sc = (struct gif_softc *)arg;
 
-	m_copydata(m, 0, sizeof(ip), (caddr_t)&ip);
+	m_copydata(m, 0, sizeof(ip), (void *)&ip);
 	ifp = ((m->m_flags & M_PKTHDR) != 0) ? m->m_pkthdr.rcvif : NULL;
 
 	return gif_validate4(&ip, sc, ifp);