u_quad_t -> u_int64_t

no functional change.

7 files changed, 183 insertions, 183 deletions

diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 999997c4cb2..5dd910220f7 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.h,v 1.31 2006/04/27 02:19:32 tedu Exp $	*/
+/*	$OpenBSD: icmp6.h,v 1.32 2006/07/06 02:56:58 brad Exp $	*/
 /*	$KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun Exp $	*/
 
 /*
@@ -511,39 +511,39 @@ do {								\
  * of the internet control message protocol version 6.
  */
 struct icmp6errstat {
-	u_quad_t icp6errs_dst_unreach_noroute;
-	u_quad_t icp6errs_dst_unreach_admin;
-	u_quad_t icp6errs_dst_unreach_beyondscope;
-	u_quad_t icp6errs_dst_unreach_addr;
-	u_quad_t icp6errs_dst_unreach_noport;
-	u_quad_t icp6errs_packet_too_big;
-	u_quad_t icp6errs_time_exceed_transit;
-	u_quad_t icp6errs_time_exceed_reassembly;
-	u_quad_t icp6errs_paramprob_header;
-	u_quad_t icp6errs_paramprob_nextheader;
-	u_quad_t icp6errs_paramprob_option;
-	u_quad_t icp6errs_redirect; /* we regard redirect as an error here */
-	u_quad_t icp6errs_unknown;
+	u_int64_t icp6errs_dst_unreach_noroute;
+	u_int64_t icp6errs_dst_unreach_admin;
+	u_int64_t icp6errs_dst_unreach_beyondscope;
+	u_int64_t icp6errs_dst_unreach_addr;
+	u_int64_t icp6errs_dst_unreach_noport;
+	u_int64_t icp6errs_packet_too_big;
+	u_int64_t icp6errs_time_exceed_transit;
+	u_int64_t icp6errs_time_exceed_reassembly;
+	u_int64_t icp6errs_paramprob_header;
+	u_int64_t icp6errs_paramprob_nextheader;
+	u_int64_t icp6errs_paramprob_option;
+	u_int64_t icp6errs_redirect; /* we regard redirect as an error here */
+	u_int64_t icp6errs_unknown;
 };
 
 struct icmp6stat {
 /* statistics related to icmp6 packets generated */
-	u_quad_t icp6s_error;		/* # of calls to icmp6_error */
-	u_quad_t icp6s_canterror;	/* no error because old was icmp */
-	u_quad_t icp6s_toofreq;		/* no error because rate limitation */
-	u_quad_t icp6s_outhist[256];
+	u_int64_t icp6s_error;		/* # of calls to icmp6_error */
+	u_int64_t icp6s_canterror;	/* no error because old was icmp */
+	u_int64_t icp6s_toofreq;	/* no error because rate limitation */
+	u_int64_t icp6s_outhist[256];
 /* statistics related to input message processed */
-	u_quad_t icp6s_badcode;		/* icmp6_code out of range */
-	u_quad_t icp6s_tooshort;	/* packet < sizeof(struct icmp6_hdr) */
-	u_quad_t icp6s_checksum;	/* bad checksum */
-	u_quad_t icp6s_badlen;		/* calculated bound mismatch */
+	u_int64_t icp6s_badcode;	/* icmp6_code out of range */
+	u_int64_t icp6s_tooshort;	/* packet < sizeof(struct icmp6_hdr) */
+	u_int64_t icp6s_checksum;	/* bad checksum */
+	u_int64_t icp6s_badlen;		/* calculated bound mismatch */
 	/*
 	 * number of responses: this member is inherited from netinet code, but
 	 * for netinet6 code, it is already available in icp6s_outhist[].
 	 */
-	u_quad_t icp6s_reflect;
-	u_quad_t icp6s_inhist[256];
-	u_quad_t icp6s_nd_toomanyopt;	/* too many ND options */
+	u_int64_t icp6s_reflect;
+	u_int64_t icp6s_inhist[256];
+	u_int64_t icp6s_nd_toomanyopt;	/* too many ND options */
 	struct icmp6errstat icp6s_outerrhist;
 #define icp6s_odst_unreach_noroute \
 	icp6s_outerrhist.icp6errs_dst_unreach_noroute
@@ -563,13 +563,13 @@ struct icmp6stat {
 #define icp6s_oparamprob_option icp6s_outerrhist.icp6errs_paramprob_option
 #define icp6s_oredirect icp6s_outerrhist.icp6errs_redirect
 #define icp6s_ounknown icp6s_outerrhist.icp6errs_unknown
-	u_quad_t icp6s_pmtuchg;		/* path MTU changes */
-	u_quad_t icp6s_nd_badopt;	/* bad ND options */
-	u_quad_t icp6s_badns;		/* bad neighbor solicitation */
-	u_quad_t icp6s_badna;		/* bad neighbor advertisement */
-	u_quad_t icp6s_badrs;		/* bad router advertisement */
-	u_quad_t icp6s_badra;		/* bad router advertisement */
-	u_quad_t icp6s_badredirect;	/* bad redirect message */
+	u_int64_t icp6s_pmtuchg;	/* path MTU changes */
+	u_int64_t icp6s_nd_badopt;	/* bad ND options */
+	u_int64_t icp6s_badns;		/* bad neighbor solicitation */
+	u_int64_t icp6s_badna;		/* bad neighbor advertisement */
+	u_int64_t icp6s_badrs;		/* bad router advertisement */
+	u_int64_t icp6s_badra;		/* bad router advertisement */
+	u_int64_t icp6s_badredirect;	/* bad redirect message */
 };
 
 /*
diff --git a/sys/netinet/pim_var.h b/sys/netinet/pim_var.h
index 2dc8c84ba75..7ff2b55fa29 100644
--- a/sys/netinet/pim_var.h
+++ b/sys/netinet/pim_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pim_var.h,v 1.1 2005/01/14 14:51:28 mcbride Exp $	*/
+/*	$OpenBSD: pim_var.h,v 1.2 2006/07/06 02:56:58 brad Exp $	*/
 /*	$NetBSD: pim_var.h,v 1.1 2004/09/04 23:32:29 manu Exp $	*/
 
 /*
@@ -49,17 +49,17 @@
  * PIM statistics kept in the kernel
  */
 struct pimstat {
-	u_quad_t pims_rcv_total_msgs;	   /* total PIM messages received    */
-	u_quad_t pims_rcv_total_bytes;	   /* total PIM bytes received	     */
-	u_quad_t pims_rcv_tooshort;	   /* rcvd with too few bytes	     */
-	u_quad_t pims_rcv_badsum;	   /* rcvd with bad checksum	     */
-	u_quad_t pims_rcv_badversion;	   /* rcvd bad PIM version	     */
-	u_quad_t pims_rcv_registers_msgs;  /* rcvd regs. msgs (data only)    */
-	u_quad_t pims_rcv_registers_bytes; /* rcvd regs. bytes (data only)   */
-	u_quad_t pims_rcv_registers_wrongiif; /* rcvd regs. on wrong iif     */
-	u_quad_t pims_rcv_badregisters;	   /* rcvd invalid registers	     */
-	u_quad_t pims_snd_registers_msgs;  /* sent regs. msgs (data only)    */
-	u_quad_t pims_snd_registers_bytes; /* sent regs. bytes (data only)   */
+	u_int64_t pims_rcv_total_msgs;	   /* total PIM messages received    */
+	u_int64_t pims_rcv_total_bytes;	   /* total PIM bytes received	     */
+	u_int64_t pims_rcv_tooshort;	   /* rcvd with too few bytes	     */
+	u_int64_t pims_rcv_badsum;	   /* rcvd with bad checksum	     */
+	u_int64_t pims_rcv_badversion;	   /* rcvd bad PIM version	     */
+	u_int64_t pims_rcv_registers_msgs;  /* rcvd regs. msgs (data only)    */
+	u_int64_t pims_rcv_registers_bytes; /* rcvd regs. bytes (data only)   */
+	u_int64_t pims_rcv_registers_wrongiif; /* rcvd regs. on wrong iif     */
+	u_int64_t pims_rcv_badregisters;    /* rcvd invalid registers	     */
+	u_int64_t pims_snd_registers_msgs;  /* sent regs. msgs (data only)    */
+	u_int64_t pims_snd_registers_bytes; /* sent regs. bytes (data only)   */
 };
 
 /*
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index b67e45dbf6f..5333088559d 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_var.h,v 1.27 2006/03/05 21:48:57 miod Exp $	*/
+/*	$OpenBSD: in6_var.h,v 1.28 2006/07/06 02:56:58 brad Exp $	*/
 /*	$KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $	*/
 
 /*
@@ -124,37 +124,37 @@ struct	in6_ifaddr {
  * IPv6 interface statistics, as defined in RFC2465 Ipv6IfStatsEntry (p12).
  */
 struct in6_ifstat {
-	u_quad_t ifs6_in_receive;	/* # of total input datagram */
-	u_quad_t ifs6_in_hdrerr;	/* # of datagrams with invalid hdr */
-	u_quad_t ifs6_in_toobig;	/* # of datagrams exceeded MTU */
-	u_quad_t ifs6_in_noroute;	/* # of datagrams with no route */
-	u_quad_t ifs6_in_addrerr;	/* # of datagrams with invalid dst */
-	u_quad_t ifs6_in_protounknown;	/* # of datagrams with unknown proto */
+	u_int64_t ifs6_in_receive;	/* # of total input datagram */
+	u_int64_t ifs6_in_hdrerr;	/* # of datagrams with invalid hdr */
+	u_int64_t ifs6_in_toobig;	/* # of datagrams exceeded MTU */
+	u_int64_t ifs6_in_noroute;	/* # of datagrams with no route */
+	u_int64_t ifs6_in_addrerr;	/* # of datagrams with invalid dst */
+	u_int64_t ifs6_in_protounknown;	/* # of datagrams with unknown proto */
 					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_in_truncated;	/* # of truncated datagrams */
-	u_quad_t ifs6_in_discard;	/* # of discarded datagrams */
+	u_int64_t ifs6_in_truncated;	/* # of truncated datagrams */
+	u_int64_t ifs6_in_discard;	/* # of discarded datagrams */
 					/* NOTE: fragment timeout is not here */
-	u_quad_t ifs6_in_deliver;	/* # of datagrams delivered to ULP */
+	u_int64_t ifs6_in_deliver;	/* # of datagrams delivered to ULP */
 					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_out_forward;	/* # of datagrams forwarded */
+	u_int64_t ifs6_out_forward;	/* # of datagrams forwarded */
 					/* NOTE: increment on outgoing if */
-	u_quad_t ifs6_out_request;	/* # of outgoing datagrams from ULP */
+	u_int64_t ifs6_out_request;	/* # of outgoing datagrams from ULP */
 					/* NOTE: does not include forwrads */
-	u_quad_t ifs6_out_discard;	/* # of discarded datagrams */
-	u_quad_t ifs6_out_fragok;	/* # of datagrams fragmented */
-	u_quad_t ifs6_out_fragfail;	/* # of datagrams failed on fragment */
-	u_quad_t ifs6_out_fragcreat;	/* # of fragment datagrams */
+	u_int64_t ifs6_out_discard;	/* # of discarded datagrams */
+	u_int64_t ifs6_out_fragok;	/* # of datagrams fragmented */
+	u_int64_t ifs6_out_fragfail;	/* # of datagrams failed on fragment */
+	u_int64_t ifs6_out_fragcreat;	/* # of fragment datagrams */
 					/* NOTE: this is # after fragment */
-	u_quad_t ifs6_reass_reqd;	/* # of incoming fragmented packets */
+	u_int64_t ifs6_reass_reqd;	/* # of incoming fragmented packets */
 					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_reass_ok;		/* # of reassembled packets */
+	u_int64_t ifs6_reass_ok;	/* # of reassembled packets */
 					/* NOTE: this is # after reass */
 					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_reass_fail;	/* # of reass failures */
+	u_int64_t ifs6_reass_fail;	/* # of reass failures */
 					/* NOTE: may not be packet count */
 					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_in_mcast;		/* # of inbound multicast datagrams */
-	u_quad_t ifs6_out_mcast;	/* # of outbound multicast datagrams */
+	u_int64_t ifs6_in_mcast;	/* # of inbound multicast datagrams */
+	u_int64_t ifs6_out_mcast;	/* # of outbound multicast datagrams */
 };
 
 /*
@@ -166,77 +166,77 @@ struct icmp6_ifstat {
 	 * Input statistics
 	 */
 	/* ipv6IfIcmpInMsgs, total # of input messages */
-	u_quad_t ifs6_in_msg;
+	u_int64_t ifs6_in_msg;
 	/* ipv6IfIcmpInErrors, # of input error messages */
-	u_quad_t ifs6_in_error;
+	u_int64_t ifs6_in_error;
 	/* ipv6IfIcmpInDestUnreachs, # of input dest unreach errors */
-	u_quad_t ifs6_in_dstunreach;
+	u_int64_t ifs6_in_dstunreach;
 	/* ipv6IfIcmpInAdminProhibs, # of input administratively prohibited errs */
-	u_quad_t ifs6_in_adminprohib;
+	u_int64_t ifs6_in_adminprohib;
 	/* ipv6IfIcmpInTimeExcds, # of input time exceeded errors */
-	u_quad_t ifs6_in_timeexceed;
+	u_int64_t ifs6_in_timeexceed;
 	/* ipv6IfIcmpInParmProblems, # of input parameter problem errors */
-	u_quad_t ifs6_in_paramprob;
+	u_int64_t ifs6_in_paramprob;
 	/* ipv6IfIcmpInPktTooBigs, # of input packet too big errors */
-	u_quad_t ifs6_in_pkttoobig;
+	u_int64_t ifs6_in_pkttoobig;
 	/* ipv6IfIcmpInEchos, # of input echo requests */
-	u_quad_t ifs6_in_echo;
+	u_int64_t ifs6_in_echo;
 	/* ipv6IfIcmpInEchoReplies, # of input echo replies */
-	u_quad_t ifs6_in_echoreply;
+	u_int64_t ifs6_in_echoreply;
 	/* ipv6IfIcmpInRouterSolicits, # of input router solicitations */
-	u_quad_t ifs6_in_routersolicit;
+	u_int64_t ifs6_in_routersolicit;
 	/* ipv6IfIcmpInRouterAdvertisements, # of input router advertisements */
-	u_quad_t ifs6_in_routeradvert;
+	u_int64_t ifs6_in_routeradvert;
 	/* ipv6IfIcmpInNeighborSolicits, # of input neighbor solicitations */
-	u_quad_t ifs6_in_neighborsolicit;
+	u_int64_t ifs6_in_neighborsolicit;
 	/* ipv6IfIcmpInNeighborAdvertisements, # of input neighbor advertisements */
-	u_quad_t ifs6_in_neighboradvert;
+	u_int64_t ifs6_in_neighboradvert;
 	/* ipv6IfIcmpInRedirects, # of input redirects */
-	u_quad_t ifs6_in_redirect;
+	u_int64_t ifs6_in_redirect;
 	/* ipv6IfIcmpInGroupMembQueries, # of input MLD queries */
-	u_quad_t ifs6_in_mldquery;
+	u_int64_t ifs6_in_mldquery;
 	/* ipv6IfIcmpInGroupMembResponses, # of input MLD reports */
-	u_quad_t ifs6_in_mldreport;
+	u_int64_t ifs6_in_mldreport;
 	/* ipv6IfIcmpInGroupMembReductions, # of input MLD done */
-	u_quad_t ifs6_in_mlddone;
+	u_int64_t ifs6_in_mlddone;
 
 	/*
 	 * Output statistics. We should solve unresolved routing problem...
 	 */
 	/* ipv6IfIcmpOutMsgs, total # of output messages */
-	u_quad_t ifs6_out_msg;
+	u_int64_t ifs6_out_msg;
 	/* ipv6IfIcmpOutErrors, # of output error messages */
-	u_quad_t ifs6_out_error;
+	u_int64_t ifs6_out_error;
 	/* ipv6IfIcmpOutDestUnreachs, # of output dest unreach errors */
-	u_quad_t ifs6_out_dstunreach;
+	u_int64_t ifs6_out_dstunreach;
 	/* ipv6IfIcmpOutAdminProhibs, # of output administratively prohibited errs */
-	u_quad_t ifs6_out_adminprohib;
+	u_int64_t ifs6_out_adminprohib;
 	/* ipv6IfIcmpOutTimeExcds, # of output time exceeded errors */
-	u_quad_t ifs6_out_timeexceed;
+	u_int64_t ifs6_out_timeexceed;
 	/* ipv6IfIcmpOutParmProblems, # of output parameter problem errors */
-	u_quad_t ifs6_out_paramprob;
+	u_int64_t ifs6_out_paramprob;
 	/* ipv6IfIcmpOutPktTooBigs, # of output packet too big errors */
-	u_quad_t ifs6_out_pkttoobig;
+	u_int64_t ifs6_out_pkttoobig;
 	/* ipv6IfIcmpOutEchos, # of output echo requests */
-	u_quad_t ifs6_out_echo;
+	u_int64_t ifs6_out_echo;
 	/* ipv6IfIcmpOutEchoReplies, # of output echo replies */
-	u_quad_t ifs6_out_echoreply;
+	u_int64_t ifs6_out_echoreply;
 	/* ipv6IfIcmpOutRouterSolicits, # of output router solicitations */
-	u_quad_t ifs6_out_routersolicit;
+	u_int64_t ifs6_out_routersolicit;
 	/* ipv6IfIcmpOutRouterAdvertisements, # of output router advertisements */
-	u_quad_t ifs6_out_routeradvert;
+	u_int64_t ifs6_out_routeradvert;
 	/* ipv6IfIcmpOutNeighborSolicits, # of output neighbor solicitations */
-	u_quad_t ifs6_out_neighborsolicit;
+	u_int64_t ifs6_out_neighborsolicit;
 	/* ipv6IfIcmpOutNeighborAdvertisements, # of output neighbor advertisements */
-	u_quad_t ifs6_out_neighboradvert;
+	u_int64_t ifs6_out_neighboradvert;
 	/* ipv6IfIcmpOutRedirects, # of output redirects */
-	u_quad_t ifs6_out_redirect;
+	u_int64_t ifs6_out_redirect;
 	/* ipv6IfIcmpOutGroupMembQueries, # of output MLD queries */
-	u_quad_t ifs6_out_mldquery;
+	u_int64_t ifs6_out_mldquery;
 	/* ipv6IfIcmpOutGroupMembResponses, # of output MLD reports */
-	u_quad_t ifs6_out_mldreport;
+	u_int64_t ifs6_out_mldreport;
 	/* ipv6IfIcmpOutGroupMembReductions, # of output MLD done */
-	u_quad_t ifs6_out_mlddone;
+	u_int64_t ifs6_out_mlddone;
 };
 
 struct	in6_ifreq {
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index 81d67e187de..4cdacbb18b7 100644
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_mroute.h,v 1.6 2003/07/08 10:23:32 itojun Exp $	*/
+/*	$OpenBSD: ip6_mroute.h,v 1.7 2006/07/06 02:56:58 brad Exp $	*/
 /*	$KAME: ip6_mroute.h,v 1.17 2001/02/10 02:05:52 itojun Exp $	*/
 
 /*
@@ -124,19 +124,19 @@ struct mf6cctl {
  * The kernel's multicast routing statistics.
  */
 struct mrt6stat {
-	u_quad_t mrt6s_mfc_lookups;	/* # forw. cache hash table hits   */
-	u_quad_t mrt6s_mfc_misses;	/* # forw. cache hash table misses */
-	u_quad_t mrt6s_upcalls;		/* # calls to mrouted              */
-	u_quad_t mrt6s_no_route;	/* no route for packet's origin    */
-	u_quad_t mrt6s_bad_tunnel;	/* malformed tunnel options        */
-	u_quad_t mrt6s_cant_tunnel;	/* no room for tunnel options      */
-	u_quad_t mrt6s_wrong_if;	/* arrived on wrong interface	   */
-	u_quad_t mrt6s_upq_ovflw;	/* upcall Q overflow		   */
-	u_quad_t mrt6s_cache_cleanups;	/* # entries with no upcalls 	   */
-	u_quad_t mrt6s_drop_sel;     	/* pkts dropped selectively        */
-	u_quad_t mrt6s_q_overflow;    	/* pkts dropped - Q overflow       */
-	u_quad_t mrt6s_pkt2large;     	/* pkts dropped - size > BKT SIZE  */
-	u_quad_t mrt6s_upq_sockfull;	/* upcalls dropped - socket full   */
+	u_int64_t mrt6s_mfc_lookups;	/* # forw. cache hash table hits   */
+	u_int64_t mrt6s_mfc_misses;	/* # forw. cache hash table misses */
+	u_int64_t mrt6s_upcalls;	/* # calls to mrouted              */
+	u_int64_t mrt6s_no_route;	/* no route for packet's origin    */
+	u_int64_t mrt6s_bad_tunnel;	/* malformed tunnel options        */
+	u_int64_t mrt6s_cant_tunnel;	/* no room for tunnel options      */
+	u_int64_t mrt6s_wrong_if;	/* arrived on wrong interface	   */
+	u_int64_t mrt6s_upq_ovflw;	/* upcall Q overflow		   */
+	u_int64_t mrt6s_cache_cleanups;	/* # entries with no upcalls 	   */
+	u_int64_t mrt6s_drop_sel;     	/* pkts dropped selectively        */
+	u_int64_t mrt6s_q_overflow;    	/* pkts dropped - Q overflow       */
+	u_int64_t mrt6s_pkt2large;     	/* pkts dropped - size > BKT SIZE  */
+	u_int64_t mrt6s_upq_sockfull;	/* upcalls dropped - socket full   */
 };
 
 #ifdef MRT6_OINIT
@@ -186,9 +186,9 @@ struct mrt6msg {
 struct sioc_sg_req6 {
 	struct sockaddr_in6 src;
 	struct sockaddr_in6 grp;
-	u_quad_t pktcnt;
-	u_quad_t bytecnt;
-	u_quad_t wrong_if;
+	u_int64_t pktcnt;
+	u_int64_t bytecnt;
+	u_int64_t wrong_if;
 };
 
 /*
@@ -196,10 +196,10 @@ struct sioc_sg_req6 {
  */
 struct sioc_mif_req6 {
 	mifi_t mifi;		/* mif number				*/
-	u_quad_t icount;	/* Input packet count on mif		*/
-	u_quad_t ocount;	/* Output packet count on mif		*/
-	u_quad_t ibytes;	/* Input byte count on mif		*/
-	u_quad_t obytes;	/* Output byte count on mif		*/
+	u_int64_t icount;	/* Input packet count on mif		*/
+	u_int64_t ocount;	/* Output packet count on mif		*/
+	u_int64_t ibytes;	/* Input byte count on mif		*/
+	u_int64_t obytes;	/* Output byte count on mif		*/
 };
 
 #if defined(_KERNEL) || defined(KERNEL)
@@ -214,10 +214,10 @@ struct mif6 {
 #endif
 	struct in6_addr	m6_lcl_addr;   	/* local interface address           */
 	struct ifnet    *m6_ifp;     	/* pointer to interface              */
-	u_quad_t	m6_pkt_in;	/* # pkts in on interface            */
-	u_quad_t	m6_pkt_out;	/* # pkts out on interface           */
-	u_quad_t	m6_bytes_in;	/* # bytes in on interface	     */
-	u_quad_t	m6_bytes_out;	/* # bytes out on interface	     */
+	u_int64_t	m6_pkt_in;	/* # pkts in on interface            */
+	u_int64_t	m6_pkt_out;	/* # pkts out on interface           */
+	u_int64_t	m6_bytes_in;	/* # bytes in on interface	     */
+	u_int64_t	m6_bytes_out;	/* # bytes out on interface	     */
 	struct route_in6 m6_route;/* cached route if this is a tunnel */
 #ifdef notyet
 	u_int		m6_rsvp_on;	/* RSVP listening on this vif */
@@ -234,9 +234,9 @@ struct mf6c {
 	mifi_t	    	 mf6c_parent; 		/* incoming IF               */
 	struct if_set	 mf6c_ifset;		/* set of outgoing IFs */
 
-	u_quad_t    	mf6c_pkt_cnt;		/* pkt count for src-grp     */
-	u_quad_t    	mf6c_byte_cnt;		/* byte count for src-grp    */
-	u_quad_t    	mf6c_wrong_if;		/* wrong if for src-grp	     */
+	u_int64_t    	mf6c_pkt_cnt;		/* pkt count for src-grp     */
+	u_int64_t    	mf6c_byte_cnt;		/* byte count for src-grp    */
+	u_int64_t    	mf6c_wrong_if;		/* wrong if for src-grp	     */
 	int	    	mf6c_expire;		/* time to clean entry up    */
 	struct timeval  mf6c_last_assert;	/* last time I sent an assert*/
 	struct rtdetq  *mf6c_stall;		/* pkts waiting for route */
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 58a523aa540..a4268785a62 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_var.h,v 1.27 2006/06/18 11:47:46 pascoe Exp $	*/
+/*	$OpenBSD: ip6_var.h,v 1.28 2006/07/06 02:56:58 brad Exp $	*/
 /*	$KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $	*/
 
 /*
@@ -136,37 +136,37 @@ struct	ip6_pktopts {
 };
 
 struct	ip6stat {
-	u_quad_t ip6s_total;		/* total packets received */
-	u_quad_t ip6s_tooshort;		/* packet too short */
-	u_quad_t ip6s_toosmall;		/* not enough data */
-	u_quad_t ip6s_fragments;	/* fragments received */
-	u_quad_t ip6s_fragdropped;	/* frags dropped(dups, out of space) */
-	u_quad_t ip6s_fragtimeout;	/* fragments timed out */
-	u_quad_t ip6s_fragoverflow;	/* fragments that exceeded limit */
-	u_quad_t ip6s_forward;		/* packets forwarded */
-	u_quad_t ip6s_cantforward;	/* packets rcvd for unreachable dest */
-	u_quad_t ip6s_redirectsent;	/* packets forwarded on same net */
-	u_quad_t ip6s_delivered;	/* datagrams delivered to upper level*/
-	u_quad_t ip6s_localout;		/* total ip packets generated here */
-	u_quad_t ip6s_odropped;		/* lost packets due to nobufs, etc. */
-	u_quad_t ip6s_reassembled;	/* total packets reassembled ok */
-	u_quad_t ip6s_fragmented;	/* datagrams successfully fragmented */
-	u_quad_t ip6s_ofragments;	/* output fragments created */
-	u_quad_t ip6s_cantfrag;		/* don't fragment flag was set, etc. */
-	u_quad_t ip6s_badoptions;	/* error in option processing */
-	u_quad_t ip6s_noroute;		/* packets discarded due to no route */
-	u_quad_t ip6s_badvers;		/* ip6 version != 6 */
-	u_quad_t ip6s_rawout;		/* total raw ip packets generated */
-	u_quad_t ip6s_badscope;		/* scope error */
-	u_quad_t ip6s_notmember;	/* don't join this multicast group */
-	u_quad_t ip6s_nxthist[256];	/* next header history */
-	u_quad_t ip6s_m1;		/* one mbuf */
-	u_quad_t ip6s_m2m[32];		/* two or more mbuf */
-	u_quad_t ip6s_mext1;		/* one ext mbuf */
-	u_quad_t ip6s_mext2m;		/* two or more ext mbuf */
-	u_quad_t ip6s_exthdrtoolong;	/* ext hdr are not continuous */
-	u_quad_t ip6s_nogif;		/* no match gif found */
-	u_quad_t ip6s_toomanyhdr;	/* discarded due to too many headers */
+	u_int64_t ip6s_total;		/* total packets received */
+	u_int64_t ip6s_tooshort;	/* packet too short */
+	u_int64_t ip6s_toosmall;	/* not enough data */
+	u_int64_t ip6s_fragments;	/* fragments received */
+	u_int64_t ip6s_fragdropped;	/* frags dropped(dups, out of space) */
+	u_int64_t ip6s_fragtimeout;	/* fragments timed out */
+	u_int64_t ip6s_fragoverflow;	/* fragments that exceeded limit */
+	u_int64_t ip6s_forward;		/* packets forwarded */
+	u_int64_t ip6s_cantforward;	/* packets rcvd for unreachable dest */
+	u_int64_t ip6s_redirectsent;	/* packets forwarded on same net */
+	u_int64_t ip6s_delivered;	/* datagrams delivered to upper level*/
+	u_int64_t ip6s_localout;	/* total ip packets generated here */
+	u_int64_t ip6s_odropped;	/* lost packets due to nobufs, etc. */
+	u_int64_t ip6s_reassembled;	/* total packets reassembled ok */
+	u_int64_t ip6s_fragmented;	/* datagrams successfully fragmented */
+	u_int64_t ip6s_ofragments;	/* output fragments created */
+	u_int64_t ip6s_cantfrag;	/* don't fragment flag was set, etc. */
+	u_int64_t ip6s_badoptions;	/* error in option processing */
+	u_int64_t ip6s_noroute;		/* packets discarded due to no route */
+	u_int64_t ip6s_badvers;		/* ip6 version != 6 */
+	u_int64_t ip6s_rawout;		/* total raw ip packets generated */
+	u_int64_t ip6s_badscope;	/* scope error */
+	u_int64_t ip6s_notmember;	/* don't join this multicast group */
+	u_int64_t ip6s_nxthist[256];	/* next header history */
+	u_int64_t ip6s_m1;		/* one mbuf */
+	u_int64_t ip6s_m2m[32];		/* two or more mbuf */
+	u_int64_t ip6s_mext1;		/* one ext mbuf */
+	u_int64_t ip6s_mext2m;		/* two or more ext mbuf */
+	u_int64_t ip6s_exthdrtoolong;	/* ext hdr are not continuous */
+	u_int64_t ip6s_nogif;		/* no match gif found */
+	u_int64_t ip6s_toomanyhdr;	/* discarded due to too many headers */
 
 	/*
 	 * statistics for improvement of the source address selection
@@ -174,26 +174,26 @@ struct	ip6stat {
 	 * XXX: hardcoded 16 = # of ip6 multicast scope types + 1
 	 */
 	/* number of times that address selection fails */
-	u_quad_t ip6s_sources_none;
+	u_int64_t ip6s_sources_none;
 	/* number of times that an address on the outgoing I/F is chosen */
-	u_quad_t ip6s_sources_sameif[16];
+	u_int64_t ip6s_sources_sameif[16];
 	/* number of times that an address on a non-outgoing I/F is chosen */
-	u_quad_t ip6s_sources_otherif[16];
+	u_int64_t ip6s_sources_otherif[16];
 	/*
 	 * number of times that an address that has the same scope
 	 * from the destination is chosen.
 	 */
-	u_quad_t ip6s_sources_samescope[16];
+	u_int64_t ip6s_sources_samescope[16];
 	/*
 	 * number of times that an address that has a different scope
 	 * from the destination is chosen.
 	 */
-	u_quad_t ip6s_sources_otherscope[16];
+	u_int64_t ip6s_sources_otherscope[16];
 	/* number of times that an deprecated address is chosen */
-	u_quad_t ip6s_sources_deprecated[16];
+	u_int64_t ip6s_sources_deprecated[16];
 
-	u_quad_t ip6s_forward_cachehit;
-	u_quad_t ip6s_forward_cachemiss;
+	u_int64_t ip6s_forward_cachehit;
+	u_int64_t ip6s_forward_cachemiss;
 };
 
 #ifdef _KERNEL
diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h
index 28193d1b008..036f83f24d9 100644
--- a/sys/netinet6/pim6_var.h
+++ b/sys/netinet6/pim6_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pim6_var.h,v 1.7 2004/11/10 03:38:52 mcbride Exp $	*/
+/*	$OpenBSD: pim6_var.h,v 1.8 2006/07/06 02:56:58 brad Exp $	*/
 /*	$KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $	*/
 
 /*
@@ -42,13 +42,13 @@
  */
 
 struct pim6stat {
-	u_quad_t pim6s_rcv_total;	/* total PIM messages received	*/
-	u_quad_t pim6s_rcv_tooshort;	/* received with too few bytes	*/
-	u_quad_t pim6s_rcv_badsum;	/* received with bad checksum	*/
-	u_quad_t pim6s_rcv_badversion;	/* received bad PIM version	*/
-	u_quad_t pim6s_rcv_registers;	/* received registers		*/
-	u_quad_t pim6s_rcv_badregisters; /* received invalid registers	*/
-	u_quad_t pim6s_snd_registers;	/* sent registers		*/
+	u_int64_t pim6s_rcv_total;	/* total PIM messages received	*/
+	u_int64_t pim6s_rcv_tooshort;	/* received with too few bytes	*/
+	u_int64_t pim6s_rcv_badsum;	/* received with bad checksum	*/
+	u_int64_t pim6s_rcv_badversion;	/* received bad PIM version	*/
+	u_int64_t pim6s_rcv_registers;	/* received registers		*/
+	u_int64_t pim6s_rcv_badregisters; /* received invalid registers	*/
+	u_int64_t pim6s_snd_registers;	/* sent registers		*/
 };
 
 #if (defined(KERNEL)) || (defined(_KERNEL))
diff --git a/sys/netinet6/raw_ip6.h b/sys/netinet6/raw_ip6.h
index c3d2556f640..1a40829539c 100644
--- a/sys/netinet6/raw_ip6.h
+++ b/sys/netinet6/raw_ip6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_ip6.h,v 1.1 2002/06/07 21:47:44 itojun Exp $	*/
+/*	$OpenBSD: raw_ip6.h,v 1.2 2006/07/06 02:56:58 brad Exp $	*/
 /*	$KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $	*/
 
 /*
@@ -37,14 +37,14 @@
  * ICMPv6 stat is counted separately.  see netinet/icmp6.h
  */
 struct rip6stat {
-	u_quad_t rip6s_ipackets;	/* total input packets */
-	u_quad_t rip6s_isum;		/* input checksum computations */
-	u_quad_t rip6s_badsum;		/* of above, checksum error */
-	u_quad_t rip6s_nosock;		/* no matching socket */
-	u_quad_t rip6s_nosockmcast;	/* of above, arrived as multicast */
-	u_quad_t rip6s_fullsock;	/* not delivered, input socket full */
+	u_int64_t rip6s_ipackets;	/* total input packets */
+	u_int64_t rip6s_isum;		/* input checksum computations */
+	u_int64_t rip6s_badsum;		/* of above, checksum error */
+	u_int64_t rip6s_nosock;		/* no matching socket */
+	u_int64_t rip6s_nosockmcast;	/* of above, arrived as multicast */
+	u_int64_t rip6s_fullsock;	/* not delivered, input socket full */
 
-	u_quad_t rip6s_opackets;	/* total output packets */
+	u_int64_t rip6s_opackets;	/* total output packets */
 };
 
 #ifdef _KERNEL