Make room for media types of the future. Extend the ifmedia word to 64 bits.

This changes numbers of the SIOCSIFMEDIA and SIOCGIFMEDIA ioctls and
grows struct ifmediareq.

Old ifconfig and dhclient binaries can still assign addresses, however
the 'media' subcommand stops working. Recompiling ifconfig and dhclient
with new headers before a reboot should not be necessary unless in very
special circumstances where non-default media settings must be used to
get link and console access is not available.

There may be some MD fallout but that will be cleared up later.

ok deraadt miod
with help and suggestions from several sharks attending l2k15

1 files changed, 3 insertions, 3 deletions

diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c
index 83d532514af..68afd1f3e47 100644
--- a/sys/dev/pci/if_cas.c
+++ b/sys/dev/pci/if_cas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cas.c,v 1.41 2015/06/24 09:40:54 mpi Exp $	*/
+/*	$OpenBSD: if_cas.c,v 1.42 2015/09/11 13:02:28 stsp Exp $	*/
 
 /*
  *
@@ -560,7 +560,7 @@ cas_config(struct cas_softc *sc)
 			 */
 			if (child->mii_phy > 1 || child->mii_inst > 1) {
 				printf("%s: cannot accommodate MII device %s"
-				       " at phy %d, instance %d\n",
+				       " at phy %d, instance %lld\n",
 				       sc->sc_dev.dv_xname,
 				       child->mii_dev.dv_xname,
 				       child->mii_phy, child->mii_inst);
@@ -1489,7 +1489,7 @@ cas_mii_statchg(struct device *dev)
 {
 	struct cas_softc *sc = (void *)dev;
 #ifdef CAS_DEBUG
-	int instance = IFM_INST(sc->sc_mii.mii_media.ifm_cur->ifm_media);
+	uint64_t instance = IFM_INST(sc->sc_mii.mii_media.ifm_cur->ifm_media);
 #endif
 	bus_space_tag_t t = sc->sc_memt;
 	bus_space_handle_t mac = sc->sc_memh;