- Use a 64-bit int for the baudrate within the ifmedia_baudrate struct and

return a 64-bit int for ifmedia_baudrate().
- Fix consumers of ifmedia_baudrate() to deal with the change.

ok claudio@ dlg@

4 files changed, 12 insertions, 10 deletions

diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 1d41aec4c65..8caebf80e1c 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mii_physubr.c,v 1.32 2007/02/10 22:36:18 kettenis Exp $	*/
+/*	$OpenBSD: mii_physubr.c,v 1.33 2007/09/17 17:34:22 brad Exp $	*/
 /*	$NetBSD: mii_physubr.c,v 1.20 2001/04/13 23:30:09 thorpej Exp $	*/
 
 /*-
@@ -362,7 +362,8 @@ mii_phy_statusmsg(struct mii_softc *sc)
 {
 	struct mii_data *mii = sc->mii_pdata;
 	struct ifnet *ifp = mii->mii_ifp;
-	int baudrate, link_state, announce = 0;
+	u_int64_t baudrate;
+	int link_state, announce = 0;
 
 	if (mii->mii_media_status & IFM_AVALID) {
 		if (mii->mii_media_status & IFM_ACTIVE) {
diff --git a/sys/dev/pci/if_art.c b/sys/dev/pci/if_art.c
index 6f2484c29f5..558a283212d 100644
--- a/sys/dev/pci/if_art.c
+++ b/sys/dev/pci/if_art.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_art.c,v 1.13 2006/01/26 16:51:00 claudio Exp $ */
+/*	$OpenBSD: if_art.c,v 1.14 2007/09/17 17:34:22 brad Exp $ */
 
 /*
  * Copyright (c) 2004,2005  Internet Business Solutions AG, Zurich, Switzerland
@@ -262,7 +262,8 @@ art_ifm_change(struct ifnet *ifp)
 	struct channel_softc	*cc = ifp->if_softc;
 	struct art_softc	*ac = (struct art_softc *)cc->cc_parent;
 	struct ifmedia		*ifm = &ac->art_ifm;
-	int			 rv, s, baudrate;
+	u_int64_t		baudrate;
+	int			rv, s;
 
 	ACCOOM_PRINTF(2, ("%s: art_ifm_change %08x\n", ifp->if_xname,
 	    ifm->ifm_media));
@@ -318,7 +319,7 @@ art_ifm_change(struct ifnet *ifp)
 	if (baudrate != ifp->if_baudrate) {
 		ifp->if_baudrate = baudrate;
 		s = splsoftnet();
-		if_link_state_change(ifp), baudrate;
+		if_link_state_change(ifp);
 		splx(s);
 	}
 
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 677b84feb52..f5b4f27777d 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_media.c,v 1.16 2005/07/28 02:15:15 brad Exp $	*/
+/*	$OpenBSD: if_media.c,v 1.17 2007/09/17 17:34:22 brad Exp $	*/
 /*	$NetBSD: if_media.c,v 1.10 2000/03/13 23:52:39 soren Exp $	*/
 
 /*-
@@ -403,7 +403,7 @@ ifmedia_delete_instance(struct ifmedia *ifm, u_int inst)
 struct ifmedia_baudrate ifmedia_baudrate_descriptions[] =
     IFM_BAUDRATE_DESCRIPTIONS;
 
-int
+u_int64_t
 ifmedia_baudrate(int mword)
 {
 	int i;
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index 16707aaaae4..ca06b448a31 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_media.h,v 1.24 2007/05/29 22:11:57 henning Exp $	*/
+/*	$OpenBSD: if_media.h,v 1.25 2007/09/17 17:34:22 brad Exp $	*/
 /*	$NetBSD: if_media.h,v 1.22 2000/02/17 21:53:16 sommerfeld Exp $	*/
 
 /*-
@@ -145,7 +145,7 @@ struct	ifmedia_entry *ifmedia_match(struct ifmedia *, u_int, u_int);
 void	ifmedia_delete_instance(struct ifmedia *, u_int);
 
 /* Compute baudrate for a given media. */
-int	ifmedia_baudrate(int);
+u_int64_t	ifmedia_baudrate(int);
 #endif /*_KERNEL */
 
 /*
@@ -514,7 +514,7 @@ struct ifmedia_description {
  */
 struct ifmedia_baudrate {
 	int	ifmb_word;		/* media word */
-	int	ifmb_baudrate;		/* corresponding baudrate */
+	u_int64_t	ifmb_baudrate;		/* corresponding baudrate */
 };
 
 #define	IFM_BAUDRATE_DESCRIPTIONS {					\