 @@ -1,14 +1,14 @@
-/* $NetBSD: if_gmc.c,v 1.5 2012/07/22 14:32:50 matt Exp $ */
+/* $NetBSD: if_gmc.c,v 1.6 2013/06/11 16:57:05 msaitoh Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas <matt@3am-software.com>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -37,27 +37,27 @@
 #include <sys/mbuf.h>
 #include <sys/bus.h>
 #include <machine/intr.h>
 #include <arm/gemini/gemini_reg.h>
 #include <arm/gemini/gemini_gmacreg.h>
 #include <arm/gemini/gemini_gmacvar.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_dl.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gmc.c,v 1.5 2012/07/22 14:32:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gmc.c,v 1.6 2013/06/11 16:57:05 msaitoh Exp $");
 #define	MAX_TXSEG	32
 struct gmc_softc {
 	device_t sc_dev;
 	struct gmac_softc *sc_psc;
 	struct gmc_softc *sc_sibling;
 	bus_dma_tag_t sc_dmat;
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
 	bus_space_handle_t sc_dma_ioh;
 	bus_space_handle_t sc_gmac_ioh;
 	struct ethercom sc_ec;
 @@ -696,27 +696,27 @@ gmc_intr(void *arg)
+	}
 	if (status & INT4_TX_XOFF) {
+	}
 	if (status & INT4_RX_FIFO_OVRN) {
 #if 0
 		if (sc->sc_psc->sc_swfree_min < MAX_RXMAPS) {
 			sc->sc_psc->sc_swfree_min++;
 			gmac_swfree_min_update(psc);
+		}
 #endif
 		sc->sc_if.if_ierrors++;
+	}
 	if (status & INT4_RGMII_STSCHG) {
-		mii_tick(&sc->sc_mii);
+		mii_pollstat(&sc->sc_mii);
+	}
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, GMAC_INT4_STATUS, status);
 	if (do_ifstart)
 		gmc_ifstart(&sc->sc_if);
 	aprint_debug_dev(sc->sc_dev, "gmac_intr: sts=%#x/%#x/%#x/%#x/%#x\n",
 	    bus_space_read_4(sc->sc_iot, sc->sc_ioh, GMAC_INT0_STATUS),
 	    bus_space_read_4(sc->sc_iot, sc->sc_ioh, GMAC_INT1_STATUS),
 	    bus_space_read_4(sc->sc_iot, sc->sc_ioh, GMAC_INT2_STATUS),
 	    bus_space_read_4(sc->sc_iot, sc->sc_ioh, GMAC_INT3_STATUS),
 	    bus_space_read_4(sc->sc_iot, sc->sc_ioh, GMAC_INT4_STATUS));
 	aprint_debug_dev(sc->sc_dev, "gmac_intr: exit rv=%d\n", rv);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: smc91cxx.c,v 1.83 2012/10/27 17:18:22 chs Exp $	*/
+/*	$NetBSD: smc91cxx.c,v 1.84 2013/06/11 16:57:05 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -61,27 +61,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  *   from FreeBSD Id: if_sn.c,v 1.4 1996/03/18 15:47:16 gardner Exp
  */
 /*
  * Core driver for the SMC 91Cxx family of Ethernet chips.
+ *
  * Memory allocation interrupt logic is drived from an SMC 91C90 driver
  * written for NetBSD/amiga by Michael Hitch.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.83 2012/10/27 17:18:22 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.84 2013/06/11 16:57:05 msaitoh Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 @@ -1092,27 +1092,27 @@ smc91cxx_intr(void *arg)
 		/* Multiple collisions. */
 		ifp->if_collisions += (card_stats & ECR_MCOLN_MASK) >> 4;
 		SMC_SELECT_BANK(sc, 2);
 		ifp->if_timer = 0;
+	}
 	if (sc->sc_chipid == CHIP_91C111 && sc->sc_internal_phy &&
 	    (status & IM_MD_INT)) {
 		/*
 		 * Internal PHY status change
 		 */
-		mii_tick(&sc->sc_mii);
+		mii_pollstat(&sc->sc_mii);
+	}
 	/*
 	 * Other errors.  Reset the interface.
 	 */
 	if (status & IM_EPH_INT) {
 		smc91cxx_stop(sc);
 		smc91cxx_init(sc);
+	}
 	/*
 	 * Attempt to queue more packets for transmission.
 	 */