 @@ -1,14 +1,14 @@
-/*	$NetBSD: ralink_eth.c,v 1.22 2021/08/17 22:00:30 andvar Exp $	*/
+/*	$NetBSD: ralink_eth.c,v 1.23 2022/03/16 10:08:02 andvar Exp $	*/
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
+ *
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /* ralink_eth.c -- Ralink Ethernet Driver */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.22 2021/08/17 22:00:30 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.23 2022/03/16 10:08:02 andvar Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 @@ -1315,27 +1315,27 @@ ralink_eth_watchdog(struct ifnet *ifp)
 	ralink_eth_softc_t * const sc = ifp->if_softc;
 	bool doing_transmit;
 	sc->sc_evcnt_watchdog.ev_count++;
 	doing_transmit = !SIMPLEQ_EMPTY(&sc->sc_txdirtyq);
 	if (doing_transmit) {
 		RALINK_DEBUG(RALINK_DEBUG_ERROR, "%s: transmit timeout\n",
 		    ifp->if_xname);
 		if_statinc(ifp, if_oerrors);
 		sc->sc_evcnt_wd_tx.ev_count++;
 	} else {
 		RALINK_DEBUG(RALINK_DEBUG_ERROR,
-		    "%s: spurious watchog timeout\n", ifp->if_xname);
+		    "%s: spurious watchdog timeout\n", ifp->if_xname);
 		sc->sc_evcnt_wd_spurious.ev_count++;
 		return;
+	}
 	sc->sc_evcnt_wd_reactivate.ev_count++;
 	const int s = splnet();
 	/* deactive the active partitions, retaining the active information */
 	ralink_eth_disable(sc);
 	ralink_eth_enable(sc);
 	splx(s);
 	/* Try to get more packets going. */
 	ralink_eth_start(ifp);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_jme.c,v 1.50 2021/05/08 00:27:02 thorpej Exp $	*/
+/*	$NetBSD: if_jme.c,v 1.51 2022/03/16 10:08:02 andvar Exp $	*/
 /*
  * Copyright (c) 2008 Manuel Bouyer.  All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -48,27 +48,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Driver for JMicron Technologies JMC250 (Giganbit) and JMC260 (Fast)
  * Ethernet Controllers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.50 2021/05/08 00:27:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.51 2022/03/16 10:08:02 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>	/* only for declaration of wakeup() used by vm.h */
 #include <sys/device.h>
 @@ -1604,27 +1604,27 @@ jme_txeof(struct jme_softc *sc)
 		bus_dmamap_sync(sc->jme_dmatag, sc->jme_txmbufm[cons0],
 , sc->jme_txmbufm[cons0]->dm_mapsize,
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->jme_dmatag, sc->jme_txmbufm[cons0]);
 		KASSERT(sc->jme_txmbuf[cons0] != NULL);
 		m_freem(sc->jme_txmbuf[cons0]);
 		sc->jme_txmbuf[cons0] = NULL;
 		sc->jme_tx_cnt -= nsegs + 1;
 		KASSERT(sc->jme_tx_cnt >= 0);
 		sc->jme_if.if_flags &= ~IFF_OACTIVE;
+	}
 	sc->jme_tx_cons = cons;
-	/* Unarm watchog timer when there is no pending descriptors in queue. */
+	/* Unarm watchdog timer when there are no pending descriptors in queue. */
 	if (sc->jme_tx_cnt == 0)
 		ifp->if_timer = 0;
 #ifdef JMEDEBUG_TX
 	printf("jme_txeof jme_tx_cnt %d\n", sc->jme_tx_cnt);
 #endif
+}
 static void
 jme_ifstart(struct ifnet *ifp)
+{
 	jme_softc_t *sc = ifp->if_softc;
 	struct mbuf *mb_head;
 	int enq;