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/kern/uipc_mbuf.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_mbuf.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- src/sys/kern/uipc_mbuf.c	2005/12/08 03:11:14	1.103
+++ src/sys/kern/uipc_mbuf.c	2005/12/26 18:45:27	1.104
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.103 2005/12/08 03:11:14 thorpej Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.104 2005/12/26 18:45:27 perry Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.103 2005/12/08 03:11:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.104 2005/12/26 18:45:27 perry Exp $");
 
 #include "opt_mbuftrace.h"
 
@@ -999,8 +999,8 @@ m_devget(char *buf, int totlen, int off0
 		 * If 'off' is non-zero, packet is trailer-encapsulated,
 		 * so we have to skip the type and length fields.
 		 */
-		cp += off + 2 * sizeof(u_int16_t);
-		totlen -= 2 * sizeof(u_int16_t);
+		cp += off + 2 * sizeof(uint16_t);
+		totlen -= 2 * sizeof(uint16_t);
 	}
 	MGETHDR(m, M_DONTWAIT, MT_DATA);
 	if (m == 0)