 @@ -1,14 +1,14 @@
-/* $NetBSD: if_ti.c,v 1.118 2020/03/05 15:36:39 msaitoh Exp $ */
+/* $NetBSD: if_ti.c,v 1.119 2020/03/05 15:40:06 msaitoh Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  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.
 @@ -71,27 +71,27 @@
  * compiling it requires a GNU toolchain targeted for mips-sgi-irix5.3.
+ *
  * The following people deserve special thanks:
  * - Terry Murphy of 3Com, for providing a 3c985 Tigon 1 board
  *   for testing
  * - Raymond Lee of Netgear, for providing a pair of Netgear
  *   GA620 Tigon 2 boards for testing
  * - Ulf Zimmermann, for bringing the GA620 to my attention and
  *   convincing me to write this driver.
  * - Andrew Gallatin for providing FreeBSD/Alpha support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.118 2020/03/05 15:36:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.119 2020/03/05 15:40:06 msaitoh Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 @@ -896,27 +896,27 @@ ti_newbuf_jumbo(struct ti_softc *sc, int
  * that's 1MB or memory, which is a lot. For now, we fill only the first
  * 256 ring entries and hope that our CPU is fast enough to keep up with
  * the NIC.
  */
 static int
 ti_init_rx_ring_std(struct ti_softc *sc)
+{
 	int		i;
 	struct ti_cmd_desc	cmd;
 	for (i = 0; i < TI_SSLOTS; i++) {
 		if (ti_newbuf_std(sc, i, NULL, 0) == ENOBUFS)
 			return (ENOBUFS);
 	};
 	TI_UPDATE_STDPROD(sc, i - 1);
 	sc->ti_std = i - 1;
 	return (0);
+}
 static void
 ti_free_rx_ring_std(struct ti_softc *sc)
+{
 	int		i;
 	for (i = 0; i < TI_STD_RX_RING_CNT; i++) {
 @@ -934,27 +934,27 @@ ti_free_rx_ring_std(struct ti_softc *sc)
 	return;
+}
 static int
 ti_init_rx_ring_jumbo(struct ti_softc *sc)
+{
 	int		i;
 	struct ti_cmd_desc	cmd;
 	for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) {
 		if (ti_newbuf_jumbo(sc, i, NULL) == ENOBUFS)
 			return (ENOBUFS);
 	};
 	TI_UPDATE_JUMBOPROD(sc, i - 1);
 	sc->ti_jumbo = i - 1;
 	return (0);
+}
 static void
 ti_free_rx_ring_jumbo(struct ti_softc *sc)
+{
 	int		i;
 	for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) {
 @@ -967,27 +967,27 @@ ti_free_rx_ring_jumbo(struct ti_softc *s
+	}
 	return;
+}
 static int
 ti_init_rx_ring_mini(struct ti_softc *sc)
+{
 	int		i;
 	for (i = 0; i < TI_MSLOTS; i++) {
 		if (ti_newbuf_mini(sc, i, NULL, 0) == ENOBUFS)
 			return (ENOBUFS);
 	};
 	TI_UPDATE_MINIPROD(sc, i - 1);
 	sc->ti_mini = i - 1;
 	return (0);
+}
 static void
 ti_free_rx_ring_mini(struct ti_softc *sc)
+{
 	int		i;
 	for (i = 0; i < TI_MINI_RX_RING_CNT; i++) {
 @@ -2186,27 +2186,27 @@ ti_intr(void *xsc)
 	if ((ifp->if_flags & IFF_RUNNING) != 0)
 		if_schedule_deferred_start(ifp);
 	return (1);
+}
 static void
 ti_stats_update(struct ti_softc *sc)
+{
 	struct ifnet *ifp = &sc->ethercom.ec_if;
 	TI_CDSTATSSYNC(sc, BUS_DMASYNC_POSTREAD);
 	uint64_t collisions =
 	   (sc->ti_rdata->ti_info.ti_stats.dot3StatsSingleCollisionFrames +
 	    sc->ti_rdata->ti_info.ti_stats.dot3StatsMultipleCollisionFrames +
 	    sc->ti_rdata->ti_info.ti_stats.dot3StatsExcessiveCollisions +
 	    sc->ti_rdata->ti_info.ti_stats.dot3StatsLateCollisions);
 	if_statadd(ifp, if_collisions, collisions - sc->ti_if_collisions);
 	sc->ti_if_collisions = collisions;
 	TI_CDSTATSSYNC(sc, BUS_DMASYNC_PREREAD);
+}
 /*
  * Encapsulate an mbuf chain in the tx ring by coupling the mbuf data
  * pointers to descriptors.