Fix more ifmedia64 fallout in the kernel. It's hiding everywhere...

6 files changed, 13 insertions, 13 deletions

diff --git a/sys/arch/hppa/gsc/if_ie_gsc.c b/sys/arch/hppa/gsc/if_ie_gsc.c
index cc5ffdaa15d..f97c87cbaad 100644
--- a/sys/arch/hppa/gsc/if_ie_gsc.c
+++ b/sys/arch/hppa/gsc/if_ie_gsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie_gsc.c,v 1.26 2014/03/29 18:09:29 guenther Exp $	*/
+/*	$OpenBSD: if_ie_gsc.c,v 1.27 2015/09/14 11:18:48 stsp Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -76,7 +76,7 @@ struct cfattach ie_gsc_ca = {
 	sizeof(struct ie_softc), ie_gsc_probe, ie_gsc_attach
 };
 
-static int ie_gsc_media[] = {
+static uint64_t ie_gsc_media[] = {
 	IFM_ETHER | IFM_10_2,
 };
 #define	IE_NMEDIA	(sizeof(ie_gsc_media) / sizeof(ie_gsc_media[0]))
diff --git a/sys/arch/octeon/dev/cn30xxgmxvar.h b/sys/arch/octeon/dev/cn30xxgmxvar.h
index d6f68042b7f..f7477296533 100644
--- a/sys/arch/octeon/dev/cn30xxgmxvar.h
+++ b/sys/arch/octeon/dev/cn30xxgmxvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxgmxvar.h,v 1.4 2014/08/11 18:52:54 miod Exp $	*/
+/*	$OpenBSD: cn30xxgmxvar.h,v 1.5 2015/09/14 11:18:49 stsp Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -64,7 +64,7 @@ struct cn30xxgmx_port_softc {
 				*sc_port_ops;
 	struct cn30xxasx_softc	*sc_port_asx;
 	struct cn30xxipd_softc	*sc_ipd;
-	int			sc_port_flowflags;
+	uint64_t		sc_port_flowflags;
 };
 
 struct cn30xxgmx_softc {
diff --git a/sys/arch/sgi/hpc/if_sq.c b/sys/arch/sgi/hpc/if_sq.c
index c0eda056c5a..a9171499d74 100644
--- a/sys/arch/sgi/hpc/if_sq.c
+++ b/sys/arch/sgi/hpc/if_sq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sq.c,v 1.15 2015/09/05 21:13:24 miod Exp $	*/
+/*	$OpenBSD: if_sq.c,v 1.16 2015/09/14 11:18:49 stsp Exp $	*/
 /*	$NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $	*/
 
 /*
@@ -193,7 +193,7 @@ sq_attach(struct device *parent, struct device *self, void *aux)
 	struct sq_softc *sc = (struct sq_softc *)self;
 	struct hpc_attach_args *haa = aux;
 	struct ifnet *ifp = &sc->sc_ac.ac_if;
-	int media;
+	uint64_t media;
 	int i, rc;
 
 	sc->sc_hpct = haa->ha_st;
diff --git a/sys/arch/sparc/dev/dmavar.h b/sys/arch/sparc/dev/dmavar.h
index 7807272c329..fda93980637 100644
--- a/sys/arch/sparc/dev/dmavar.h
+++ b/sys/arch/sparc/dev/dmavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dmavar.h,v 1.8 2014/07/28 18:31:39 miod Exp $	*/
+/*	$OpenBSD: dmavar.h,v 1.9 2015/09/14 11:18:49 stsp Exp $	*/
 /*	$NetBSD: dmavar.h,v 1.11 1996/11/27 21:49:53 pk Exp $ */
 
 /*
@@ -44,7 +44,7 @@ struct dma_softc {
 	int (*setup)(struct dma_softc *, caddr_t *, size_t *, int, size_t *);
 	void (*go)(struct dma_softc *);
 	u_int	sc_dmactl;
-	int	sc_defaultmedia;		/* default Ethernet media */
+	uint64_t	sc_defaultmedia;	/* default Ethernet media */
 };
 
 #define DMACSR(sc)	(sc->sc_regs->csr)
diff --git a/sys/arch/sparc/dev/qe.c b/sys/arch/sparc/dev/qe.c
index 9295dc16dc7..7595fc77df0 100644
--- a/sys/arch/sparc/dev/qe.c
+++ b/sys/arch/sparc/dev/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.40 2015/06/24 09:40:53 mpi Exp $	*/
+/*	$OpenBSD: qe.c,v 1.41 2015/09/14 11:18:49 stsp Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000 Jason L. Wright.
@@ -864,7 +864,7 @@ qe_ifmedia_upd(ifp)
 	struct ifnet *ifp;
 {
 	struct qesoftc *sc = (struct qesoftc *)ifp->if_softc;
-	int media = sc->sc_ifmedia.ifm_media;
+	uint64_t media = sc->sc_ifmedia.ifm_media;
 
 	if (IFM_TYPE(media) != IFM_ETHER)
 		return (EINVAL);
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 8a21fdfd824..f84c0688810 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tl.c,v 1.64 2015/06/24 09:40:54 mpi Exp $	*/
+/*	$OpenBSD: if_tl.c,v 1.65 2015/09/14 11:18:49 stsp Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -272,7 +272,7 @@ int tl_miibus_readreg(struct device *, int, int);
 void tl_miibus_writereg(struct device *, int, int, int);
 void tl_miibus_statchg(struct device *);
 
-void tl_setmode(struct tl_softc *, int);
+void tl_setmode(struct tl_softc *, uint64_t);
 int tl_calchash(caddr_t);
 void tl_iff(struct tl_softc *);
 void tl_setfilt(struct tl_softc *, caddr_t, int);
@@ -722,7 +722,7 @@ tl_miibus_statchg(struct device *dev)
  * Set modes for bitrate devices.
  */
 void
-tl_setmode(struct tl_softc *sc, int media)
+tl_setmode(struct tl_softc *sc, uint64_t media)
 {
 	if (IFM_SUBTYPE(media) == IFM_10_5)
 		tl_dio_setbit(sc, TL_ACOMMIT, TL_AC_MTXD1);