Module Name: src
Committed By: dyoung
Date: Mon Oct 5 21:27:36 UTC 2009
Modified Files:
src/sys/net: if_media.c if_media.h if_spppvar.h
Log Message:
Replace u_quad_t with uint64_t. u_quad_t is just a typedef for
uint64_t, so no ABI/API breakage will result from this change.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/net/if_media.c
cvs rdiff -u -r1.52 -r1.53 src/sys/net/if_media.h
cvs rdiff -u -r1.15 -r1.16 src/sys/net/if_spppvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_media.c
diff -u src/sys/net/if_media.c:1.29 src/sys/net/if_media.c:1.30
--- src/sys/net/if_media.c:1.29 Sun Jun 15 16:33:58 2008
+++ src/sys/net/if_media.c Mon Oct 5 21:27:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.c,v 1.29 2008/06/15 16:33:58 christos Exp $ */
+/* $NetBSD: if_media.c,v 1.30 2009/10/05 21:27:36 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.29 2008/06/15 16:33:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.30 2009/10/05 21:27:36 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -429,7 +429,7 @@
static const struct ifmedia_baudrate ifmedia_baudrate_descriptions[] =
IFM_BAUDRATE_DESCRIPTIONS;
-u_quad_t
+uint64_t
ifmedia_baudrate(int mword)
{
int i;
Index: src/sys/net/if_media.h
diff -u src/sys/net/if_media.h:1.52 src/sys/net/if_media.h:1.53
--- src/sys/net/if_media.h:1.52 Wed Aug 12 11:17:17 2009
+++ src/sys/net/if_media.h Mon Oct 5 21:27:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.h,v 1.52 2009/08/12 11:17:17 msaitoh Exp $ */
+/* $NetBSD: if_media.h,v 1.53 2009/10/05 21:27:36 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -136,7 +136,7 @@
void ifmedia_delete_instance(struct ifmedia *, u_int);
/* Compute baudrate for a given media. */
-u_quad_t ifmedia_baudrate(int);
+uint64_t ifmedia_baudrate(int);
/* Remove all media */
void ifmedia_removeall(struct ifmedia *);
@@ -536,7 +536,7 @@
*/
struct ifmedia_baudrate {
int ifmb_word; /* media word */
- u_quad_t ifmb_baudrate; /* corresponding baudrate */
+ uint64_t ifmb_baudrate; /* corresponding baudrate */
};
#define IFM_BAUDRATE_DESCRIPTIONS { \
Index: src/sys/net/if_spppvar.h
diff -u src/sys/net/if_spppvar.h:1.15 src/sys/net/if_spppvar.h:1.16
--- src/sys/net/if_spppvar.h:1.15 Fri Aug 22 12:13:18 2008
+++ src/sys/net/if_spppvar.h Mon Oct 5 21:27:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppvar.h,v 1.15 2008/08/22 12:13:18 martin Exp $ */
+/* $NetBSD: if_spppvar.h,v 1.16 2009/10/05 21:27:36 dyoung Exp $ */
#ifndef _NET_IF_SPPPVAR_H_
#define _NET_IF_SPPPVAR_H_
@@ -89,7 +89,7 @@
u_int pp_maxalive; /* number or echo req. w/o reply */
u_long pp_seq[IDX_COUNT]; /* local sequence number */
u_long pp_rseq[IDX_COUNT]; /* remote sequence number */
- u_quad_t pp_saved_mtu; /* saved MTU value */
+ uint64_t pp_saved_mtu; /* saved MTU value */
time_t pp_last_receive; /* peer's last "sign of life" */
time_t pp_max_noreceive; /* seconds since last receive before
we start to worry and send echo
