 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_aue.c,v 1.178 2022/03/03 05:52:55 riastradh Exp $	*/
+/*	$NetBSD: if_aue.c,v 1.179 2022/03/03 05:53:04 riastradh Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *	Bill Paul <wpaul@ee.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.
 @@ -66,27 +66,27 @@
 /*
  * Ported to NetBSD and somewhat rewritten by Lennart Augustsson.
  */
 /*
  * TODO:
  * better error messages from rxstat
  * more error checks
  * investigate short rx problem
  * proper cleanup on errors
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.178 2022/03/03 05:52:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.179 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/usbhist.h>
 #include <dev/usb/if_auereg.h>
 #ifdef INET
 @@ -601,30 +601,30 @@ aue_crc(void *addrv)
 	/* Compute CRC for the address value. */
 	crc = 0xFFFFFFFF; /* initial value */
 	for (idx = 0; idx < 6; idx++) {
 		for (data = *addr++, bit = 0; bit < 8; bit++, data >>= 1)
 			crc = (crc >> 1) ^ (((crc ^ data) & 1) ? AUE_POLY : 0);
+	}
 	return crc & ((1 << AUE_BITS) - 1);
+}
 static void
-aue_setiff_locked(struct usbnet *un)
+aue_uno_mcast(struct ifnet *ifp)
+{
 	struct usbnet * const un = ifp->if_softc;
 	struct aue_softc * const sc = usbnet_softc(un);
 	struct ifnet * const	ifp = usbnet_ifp(un);
 	struct ethercom *	ec = usbnet_ec(un);
 	struct ether_multi	*enm;
 	struct ether_multistep	step;
 	uint32_t		h = 0, i;
 	uint8_t hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 	AUEHIST_FUNC();
 	AUEHIST_CALLARGSN(5, "aue%jd: enter", device_unit(un->un_dev), 0, 0, 0);
 	usbnet_isowned_core(un);
 	if (ifp->if_flags & IFF_PROMISC) {
 allmulti:
 @@ -978,51 +978,39 @@ aue_uno_init(struct ifnet *ifp)
 	eaddr = CLLADDR(ifp->if_sadl);
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
 		aue_csr_write_1(sc, AUE_PAR0 + i, eaddr[i]);
 	 /* If we want promiscuous mode, set the allframes bit. */
 	if (ifp->if_flags & IFF_PROMISC)
 		AUE_SETBIT(sc, AUE_CTL2, AUE_CTL2_RX_PROMISC);
 	else
 		AUE_CLRBIT(sc, AUE_CTL2, AUE_CTL2_RX_PROMISC);
 	rv = usbnet_init_rx_tx(un);
 	/* Load the multicast filter. */
-	aue_setiff_locked(un);
+	aue_uno_mcast(ifp);
 	/* Enable RX and TX */
 	aue_csr_write_1(sc, AUE_CTL0, AUE_CTL0_RXSTAT_APPEND | AUE_CTL0_RX_ENB);
 	AUE_SETBIT(sc, AUE_CTL0, AUE_CTL0_TX_ENB);
 	AUE_SETBIT(sc, AUE_CTL2, AUE_CTL2_EP3_CLR);
 	//mii_mediachg(mii);
 	return rv;
+}
 static void
 aue_uno_mcast(struct ifnet *ifp)
 	AUEHIST_FUNC();
 	AUEHIST_CALLARGSN(5, "aue%jd: enter",
 	    device_unit(((struct usbnet *)(ifp->if_softc))->un_dev),
 , 0, 0);
 	aue_setiff_locked(ifp);
 static void
 aue_uno_stop(struct ifnet *ifp, int disable)
+{
 	struct usbnet * const	un = ifp->if_softc;
 	struct aue_softc * const sc = usbnet_softc(un);
 	AUEHIST_FUNC();
 	AUEHIST_CALLARGSN(5, "aue%jd: enter", device_unit(un->un_dev), 0, 0, 0);
 	aue_csr_write_1(sc, AUE_CTL0, 0);
 	aue_csr_write_1(sc, AUE_CTL1, 0);
 	aue_reset(sc);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_axe.c,v 1.140 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.141 2022/03/03 05:53:04 riastradh Exp $	*/
 /*	$OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -77,27 +77,27 @@
  * (Adam Weinberger wanted me to name this driver if_gir.c.)
  */
 /*
  * Ax88178 and Ax88772 support backported from the OpenBSD driver.
  * 2007/02/12, J.R. Oldroyd, fbsd@opal.com
+ *
  * Manual here:
  * http://www.asix.com.tw/FrootAttach/datasheet/AX88178_datasheet_Rev10.pdf
  * http://www.asix.com.tw/FrootAttach/datasheet/AX88772_datasheet_Rev10.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.140 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.141 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/usbhist.h>
 #include <dev/usb/if_axereg.h>
 struct axe_type {
 @@ -416,31 +416,31 @@ axe_uno_mii_statchg(struct ifnet *ifp)
 		case IFM_10_T:
 			usbnet_set_link(un, true);
 			break;
+		}
+	}
 	DPRINTF("val=%#jx", val, 0, 0, 0);
 	err = axe_cmd(sc, AXE_CMD_WRITE_MEDIA, 0, val, NULL);
 	if (err)
 		device_printf(un->un_dev, "media change failed\n");
+}
 static void
-axe_rcvfilt_locked(struct usbnet *un)
+axe_uno_mcast(struct ifnet *ifp)
+{
 	AXEHIST_FUNC(); AXEHIST_CALLED();
 	struct usbnet * const un = ifp->if_softc;
 	struct axe_softc * const sc = usbnet_softc(un);
 	struct ifnet * const ifp = usbnet_ifp(un);
 	struct ethercom *ec = usbnet_ec(un);
 	struct ether_multi *enm;
 	struct ether_multistep step;
 	uint16_t rxmode;
 	uint32_t h = 0;
 	uint8_t mchash[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 	if (usbnet_isdying(un))
 		return;
 	if (axe_cmd(sc, AXE_CMD_RXCTL_READ, 0, 0, &rxmode)) {
 		device_printf(un->un_dev, "can't read rxmode");
 		return;
 @@ -1291,39 +1291,31 @@ axe_uno_init(struct ifnet *ifp)
 			if (un->un_udev->ud_speed == USB_SPEED_HIGH) {
 				/* Largest possible USB buffer size for AX88178 */
+			}
 #endif
 			rxmode |= AXE_178_RXCMD_MFB_16384;
+		}
+	}
 	DPRINTF("rxmode %#jx", rxmode, 0, 0, 0);
 	axe_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, rxmode, NULL);
 	/* Accept multicast frame or run promisc. mode */
-	axe_rcvfilt_locked(un);
+	axe_uno_mcast(ifp);
 	return usbnet_init_rx_tx(un);
+}
 static void
 axe_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const un = ifp->if_softc;
 	axe_rcvfilt_locked(un);
 static void
 axe_uno_stop(struct ifnet *ifp, int disable)
+{
 	struct usbnet * const un = ifp->if_softc;
 	axe_reset(un);
+}
 #ifdef _MODULE
 #include "ioconf.c"
 #endif
 USBNET_MODULE(axe)

 @@ -1,39 +1,39 @@
-/*	$NetBSD: if_axen.c,v 1.82 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_axen.c,v 1.83 2022/03/03 05:53:04 riastradh Exp $	*/
 /*	$OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $	*/
 /*
  * Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * ASIX Electronics AX88178a USB 2.0 ethernet and AX88179 USB 3.0 Ethernet
  * driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.82 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.83 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <netinet/in.h>		/* XXX for netinet/ip.h */
 #include <netinet/ip.h>		/* XXX for IP_MAXPACKET */
 #include <dev/usb/usbnet.h>
 #include <dev/usb/if_axenreg.h>
 @@ -215,29 +215,29 @@ axen_uno_mii_statchg(struct ifnet *ifp)
 	case IFM_10_T:
 		/* doesn't need to be handled */
 		break;
+	}
 	DPRINTF(("%s: val=%#x\n", __func__, val));
 	wval = htole16(val);
 	err = axen_cmd(un, AXEN_CMD_MAC_WRITE2, 2, AXEN_MEDIUM_STATUS, &wval);
 	if (err)
 		aprint_error_dev(un->un_dev, "media change failed\n");
+}
 static void
-axen_setiff_locked(struct usbnet *un)
+axen_uno_mcast(struct ifnet *ifp)
+{
-	struct ifnet * const ifp = usbnet_ifp(un);
+	struct usbnet * const un = ifp->if_softc;
 	struct ethercom *ec = usbnet_ec(un);
 	struct ether_multi *enm;
 	struct ether_multistep step;
 	uint32_t h = 0;
 	uint16_t rxmode;
 	uint8_t hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 	uint16_t wval;
 	if (usbnet_isdying(un))
 		return;
 	usbnet_isowned_core(un);
 @@ -559,34 +559,26 @@ axen_uno_ioctl(struct ifnet *ifp, u_long
 	switch (cmd) {
 	case SIOCSIFCAP:
 		axen_setoe_locked(un);
 		break;
 	default:
 		break;
+	}
 	usbnet_unlock_core(un);
 	return 0;
+}
 static void
 axen_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const un = ifp->if_softc;
 	axen_setiff_locked(un);
 static int
 axen_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usb_attach_arg *uaa = aux;
 	return axen_lookup(uaa->uaa_vendor, uaa->uaa_product) != NULL ?
 		UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
+}
 static void
 axen_attach(device_t parent, device_t self, void *aux)
+{
 	USBNET_MII_DECL_DEFAULT(unm);
 @@ -906,27 +898,27 @@ axen_uno_init(struct ifnet *ifp)
 	usbnet_stop(un, ifp, 1);
 	/* Reset the ethernet interface. */
 	axen_reset(un);
 	/* XXX: ? */
 	bval = 0x01;
 	axen_cmd(un, AXEN_CMD_MAC_WRITE, 1, AXEN_UNK_28, &bval);
 	/* Configure offloading engine. */
 	axen_setoe_locked(un);
 	/* Program promiscuous mode and multicast filters. */
-	axen_setiff_locked(un);
+	axen_uno_mcast(ifp);
 	/* Enable receiver, set RX mode */
 	axen_cmd(un, AXEN_CMD_MAC_READ2, 2, AXEN_MAC_RXCTL, &wval);
 	rxmode = le16toh(wval);
 	rxmode |= AXEN_RXCTL_START;
 	wval = htole16(rxmode);
 	axen_cmd(un, AXEN_CMD_MAC_WRITE2, 2, AXEN_MAC_RXCTL, &wval);
 	return usbnet_init_rx_tx(un);
+}
 static void
 axen_uno_stop(struct ifnet *ifp, int disable)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cue.c,v 1.98 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_cue.c,v 1.99 2022/03/03 05:53:04 riastradh Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *	Bill Paul <wpaul@ee.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.
 @@ -47,27 +47,27 @@
  * The CATC USB-EL1210A provides USB ethernet support at 10Mbps. The
  * RX filter uses a 512-bit multicast hash table, single perfect entry
  * for the station address, and promiscuous mode. Unlike the ADMtek
  * and KLSI chips, the CATC ASIC supports read and write combining
  * mode where multiple packets can be transferred using a single bulk
  * transaction, which helps performance a great deal.
  */
 /*
  * Ported to NetBSD and somewhat rewritten by Lennart Augustsson.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.98 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.99 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/if_cuereg.h>
 #ifdef INET
 #include <netinet/in.h>
 @@ -347,31 +347,31 @@ cue_crc(const char *addr)
 	/* Compute CRC for the address value. */
 	crc = 0xFFFFFFFF; /* initial value */
 	for (idx = 0; idx < 6; idx++) {
 		for (data = *addr++, bit = 0; bit < 8; bit++, data >>= 1)
 			crc = (crc >> 1) ^ (((crc ^ data) & 1) ? CUE_POLY : 0);
+	}
 	return crc & ((1 << CUE_BITS) - 1);
+}
 static void
-cue_setiff_locked(struct usbnet *un)
+cue_uno_mcast(struct ifnet *ifp)
+{
 	struct usbnet		*un = ifp->if_softc;
 	struct cue_softc	*sc = usbnet_softc(un);
 	struct ethercom		*ec = usbnet_ec(un);
 	struct ifnet		*ifp = usbnet_ifp(un);
 	struct ether_multi	*enm;
 	struct ether_multistep	step;
 	uint32_t		h, i;
 	DPRINTFN(2,("%s: cue_setiff if_flags=%#x\n",
 	    device_xname(un->un_dev), ifp->if_flags));
 	if (ifp->if_flags & IFF_PROMISC) {
 allmulti:
 		ifp->if_flags |= IFF_ALLMULTI;
 		for (i = 0; i < CUE_MCAST_TABLE_LEN; i++)
 			sc->cue_mctab[i] = 0xFF;
 		cue_mem(un, CUE_CMD_WRITESRAM, CUE_MCAST_TABLE_ADDR,
 @@ -638,53 +638,45 @@ cue_uno_init(struct ifnet *ifp)
 	eaddr = CLLADDR(ifp->if_sadl);
 	/* Set MAC address */
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
 		cue_csr_write_1(un, CUE_PAR0 - i, eaddr[i]);
 	/* Enable RX logic. */
 	ctl = CUE_ETHCTL_RX_ON | CUE_ETHCTL_MCAST_ON;
 	if (ifp->if_flags & IFF_PROMISC)
 		ctl |= CUE_ETHCTL_PROMISC;
 	cue_csr_write_1(un, CUE_ETHCTL, ctl);
 	/* Load the multicast filter. */
-	cue_setiff_locked(un);
+	cue_uno_mcast(ifp);
 	/*
 	 * Set the number of RX and TX buffers that we want
 	 * to reserve inside the ASIC.
 	 */
 	cue_csr_write_1(un, CUE_RX_BUFPKTS, CUE_RX_FRAMES);
 	cue_csr_write_1(un, CUE_TX_BUFPKTS, CUE_TX_FRAMES);
 	/* Set advanced operation modes. */
 	cue_csr_write_1(un, CUE_ADVANCED_OPMODES,
 	    CUE_AOP_EMBED_RXLEN | 0x01); /* 1 wait state */
 	/* Program the LED operation. */
 	cue_csr_write_1(un, CUE_LEDCTL, CUE_LEDCTL_FOLLOW_LINK);
 	return usbnet_init_rx_tx(un);
+}
 static void
 cue_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const	un = ifp->if_softc;
 	cue_setiff_locked(un);
 /* Stop and reset the adapter.  */
 static void
 cue_uno_stop(struct ifnet *ifp, int disable)
+{
 	struct usbnet * const	un = ifp->if_softc;
 	DPRINTFN(10,("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	cue_csr_write_1(un, CUE_ETHCTL, 0);
 	cue_reset(un);
+}
 #ifdef _MODULE

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_kue.c,v 1.111 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_kue.c,v 1.112 2022/03/03 05:53:04 riastradh Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *	Bill Paul <wpaul@ee.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.
 @@ -61,27 +61,27 @@
  * powered on and retain its firmware. In this case, we don't need
  * to load the firmware a second time.
+ *
  * Special thanks to Rob Furr for providing an ADS Technologies
  * adapter for development and testing. No monkeys were harmed during
  * the development of this driver.
  */
 /*
  * Ported to NetBSD and somewhat rewritten by Lennart Augustsson.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.111 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.112 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <dev/usb/usbnet.h>
 #ifdef INET
 #include <netinet/in.h>
 @@ -308,31 +308,31 @@ kue_load_fw(struct usbnet *un)
 	 * dependent on the revision data.
 	 */
 	(void)usbd_reload_device_desc(un->un_udev);
 	DPRINTFN(1,("%s: %s: done\n", device_xname(un->un_dev), __func__));
 	/* Reset the adapter. */
 	kue_reset(un);
 	return 0;
+}
 static void
-kue_setiff_locked(struct usbnet *un)
+kue_uno_mcast(struct ifnet *ifp)
+{
 	struct usbnet *		un = ifp->if_softc;
 	struct ethercom *	ec = usbnet_ec(un);
 	struct kue_softc *	sc = usbnet_softc(un);
 	struct ifnet * const	ifp = usbnet_ifp(un);
 	struct ether_multi	*enm;
 	struct ether_multistep	step;
 	int			i;
 	DPRINTFN(5,("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	 /* If we want promiscuous mode, set the allframes bit. */
 	if (ifp->if_flags & IFF_PROMISC)
 		sc->kue_rxfilt |= KUE_RXFILT_PROMISC;
 	else
 		sc->kue_rxfilt &= ~KUE_RXFILT_PROMISC;
 	if (ifp->if_flags & IFF_PROMISC) {
 @@ -612,31 +612,23 @@ kue_uno_init(struct ifnet *ifp)
 	sc->kue_rxfilt = KUE_RXFILT_UNICAST | KUE_RXFILT_BROADCAST;
 	/* I'm not sure how to tune these. */
 #if 0
 	/*
 	 * Leave this one alone for now; setting it
 	 * wrong causes lockups on some machines/controllers.
 	 */
 	kue_setword(un, KUE_CMD_SET_SOFS, 1);
 #endif
 	kue_setword(un, KUE_CMD_SET_URB_SIZE, 64);
 	/* Load the multicast filter. */
-	kue_setiff_locked(un);
+	kue_uno_mcast(ifp);
 	return usbnet_init_rx_tx(un);
+}
 static void
 kue_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const	un = ifp->if_softc;
 	kue_setiff_locked(un);
 #ifdef _MODULE
 #include "ioconf.c"
 #endif
 USBNET_MODULE(kue)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_mos.c,v 1.14 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_mos.c,v 1.15 2022/03/03 05:53:04 riastradh Exp $	*/
 /*	$OpenBSD: if_mos.c,v 1.40 2019/07/07 06:40:10 kevlo Exp $	*/
 /*
  * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -62,27 +62,27 @@
  * 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.
  */
 /*
  * Moschip MCS7730/MCS7830/MCS7832 USB to Ethernet controller
  * The datasheet is available at the following URL:
  * http://www.moschip.com/data/products/MCS7830/Data%20Sheet_7830.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.14 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.15 2022/03/03 05:53:04 riastradh Exp $");
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/if_mosreg.h>
 #define MOS_PAUSE_REWRITES	3
 #define MOS_TIMEOUT		1000
 #define MOS_RX_LIST_CNT		1
 #define MOS_TX_LIST_CNT		1
 @@ -448,29 +448,29 @@ mos_uno_mii_statchg(struct ifnet *ifp)
+		}
 		usbnet_set_link(un, true);
+	}
 	/* re-enable TX, RX */
 	val |= (MOS_CTL_TX_ENB | MOS_CTL_RX_ENB);
 	err = mos_reg_write_1(un, MOS_CTL, val);
 	if (err)
 		aprint_error_dev(un->un_dev, "media change failed\n");
+}
 static void
-mos_rcvfilt_locked(struct usbnet *un)
+mos_uno_mcast(struct ifnet *ifp)
+{
-	struct ifnet		*ifp = usbnet_ifp(un);
+	struct usbnet		*un = ifp->if_softc;
 	struct ethercom		*ec = usbnet_ec(un);
 	struct ether_multi	*enm;
 	struct ether_multistep	step;
 	u_int32_t h = 0;
 	u_int8_t rxmode, mchash[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 	if (usbnet_isdying(un))
 		return;
 	rxmode = mos_reg_read_1(un, MOS_CTL);
 	rxmode &= ~(MOS_CTL_ALLMULTI | MOS_CTL_RX_PROMISC);
 	ETHER_LOCK(ec);
 @@ -738,39 +738,31 @@ mos_uno_init(struct ifnet *ifp)
 	/* Reset the ethernet interface. */
 	mos_reset(un);
 	/* Write MAC address. */
 	mos_writemac(un);
 	/* Read and set transmitter IPG values */
 	ipgs[0] = mos_reg_read_1(un, MOS_IPG0);
 	ipgs[1] = mos_reg_read_1(un, MOS_IPG1);
 	mos_reg_write_1(un, MOS_IPG0, ipgs[0]);
 	mos_reg_write_1(un, MOS_IPG1, ipgs[1]);
 	/* Accept multicast frame or run promisc. mode */
-	mos_rcvfilt_locked(un);
+	mos_uno_mcast(ifp);
 	/* Enable receiver and transmitter, bridge controls speed/duplex mode */
 	rxmode = mos_reg_read_1(un, MOS_CTL);
 	rxmode |= MOS_CTL_RX_ENB | MOS_CTL_TX_ENB | MOS_CTL_BS_ENB;
 	rxmode &= ~(MOS_CTL_SLEEP);
 	mos_reg_write_1(un, MOS_CTL, rxmode);
 	return usbnet_init_rx_tx(un);
+}
 static void
 mos_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const un = ifp->if_softc;
 	mos_rcvfilt_locked(un);
 void
 mos_uno_stop(struct ifnet *ifp, int disable)
+{
 	struct usbnet * const un = ifp->if_softc;
 	mos_reset(un);
+}

 @@ -1,36 +1,36 @@
-/*	$NetBSD: if_mue.c,v 1.71 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_mue.c,v 1.72 2022/03/03 05:53:04 riastradh Exp $	*/
 /*	$OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Kevin Lo <kevlo@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /* Driver for Microchip LAN7500/LAN7800 chipsets. */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.71 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.72 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/if_muereg.h>
 #include <dev/usb/if_muevar.h>
 @@ -82,34 +82,33 @@ static void	mue_attach(device_t, device_
 static uint32_t	mue_csr_read(struct usbnet *, uint32_t);
 static int	mue_csr_write(struct usbnet *, uint32_t, uint32_t);
 static int	mue_wait_for_bits(struct usbnet *, uint32_t, uint32_t,
 		    uint32_t, uint32_t);
 static uint8_t	mue_eeprom_getbyte(struct usbnet *, int, uint8_t *);
 static bool	mue_eeprom_present(struct usbnet *);
 static void	mue_dataport_write(struct usbnet *, uint32_t, uint32_t,
 		    uint32_t, uint32_t *);
 static void	mue_init_ltm(struct usbnet *);
 static int	mue_chip_init(struct usbnet *);
 static void	mue_set_macaddr(struct usbnet *);
 static int	mue_get_macaddr(struct usbnet *, prop_dictionary_t);
 static int	mue_prepare_tso(struct usbnet *, struct mbuf *);
-static void	mue_setiff_locked(struct usbnet *);
+static void	mue_uno_mcast(struct ifnet *);
 static void	mue_sethwcsum_locked(struct usbnet *);
 static void	mue_setmtu_locked(struct usbnet *);
 static void	mue_reset(struct usbnet *);
 static void	mue_uno_stop(struct ifnet *, int);
 static int	mue_uno_ioctl(struct ifnet *, u_long, void *);
 static void	mue_uno_mcast(struct ifnet *);
 static int	mue_uno_mii_read_reg(struct usbnet *, int, int, uint16_t *);
 static int	mue_uno_mii_write_reg(struct usbnet *, int, int, uint16_t);
 static void	mue_uno_mii_statchg(struct ifnet *);
 static void	mue_uno_rx_loop(struct usbnet *, struct usbnet_chain *,
 				uint32_t);
 static unsigned	mue_uno_tx_prepare(struct usbnet *, struct mbuf *,
 				   struct usbnet_chain *);
 static int	mue_uno_init(struct ifnet *);
 static const struct usbnet_ops mue_ops = {
 	.uno_stop = mue_uno_stop,
 	.uno_ioctl = mue_uno_ioctl,
 	.uno_mcast = mue_uno_mcast,
 @@ -987,30 +986,30 @@ mue_prepare_tso(struct usbnet *un, struc
 			    sizeof(len), &len);
 	} else {
 		if (__predict_true(m->m_len >= off + (int)sizeof(*ip6))) {
 			ip6 = (void *)(mtod(m, char *) + off);
 			ip6->ip6_plen = 0;
 		} else
 			m_copyback(m, off + offsetof(struct ip6_hdr, ip6_plen),
 			    sizeof(len), &len);
+	}
 	return 0;
+}
 static void
-mue_setiff_locked(struct usbnet *un)
+mue_uno_mcast(struct ifnet *ifp)
+{
 	struct usbnet *un = ifp->if_softc;
 	struct ethercom *ec = usbnet_ec(un);
 	struct ifnet * const ifp = usbnet_ifp(un);
 	const uint8_t *enaddr = CLLADDR(ifp->if_sadl);
 	struct ether_multi *enm;
 	struct ether_multistep step;
 	uint32_t pfiltbl[MUE_NUM_ADDR_FILTX][2];
 	uint32_t hashtbl[MUE_DP_SEL_VHF_HASH_LEN];
 	uint32_t reg, rxfilt, h, hireg, loreg;
 	size_t i;
 	if (usbnet_isdying(un))
 		return;
 	/* Clear perfect filter and hash tables. */
 	memset(pfiltbl, 0, sizeof(pfiltbl));
 @@ -1232,27 +1231,27 @@ mue_uno_init(struct ifnet *ifp)
 		return EIO;
+	}
 	/* Cancel pending I/O and free all TX/RX buffers. */
 	if (ifp->if_flags & IFF_RUNNING)
 		usbnet_stop(un, ifp, 1);
 	mue_reset(un);
 	/* Set MAC address. */
 	mue_set_macaddr(un);
 	/* Load the multicast filter. */
-	mue_setiff_locked(un);
+	mue_uno_mcast(ifp);
 	/* TCP/UDP checksum offload engines. */
 	mue_sethwcsum_locked(un);
 	/* Set MTU. */
 	mue_setmtu_locked(un);
 	return usbnet_init_rx_tx(un);
+}
 static int
 mue_uno_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 @@ -1267,34 +1266,26 @@ mue_uno_ioctl(struct ifnet *ifp, u_long
 	case SIOCSIFMTU:
 		mue_setmtu_locked(un);
 		break;
 	default:
 		break;
+	}
 	usbnet_unlock_core(un);
 	return 0;
+}
 static void
 mue_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const un = ifp->if_softc;
 	mue_setiff_locked(un);
 static void
 mue_reset(struct usbnet *un)
+{
 	if (usbnet_isdying(un))
 		return;
 	/* Wait a little while for the chip to get its brains in order. */
 	usbd_delay_ms(un->un_udev, 1);
 //	mue_chip_init(un); /* XXX */
+}
 static void
 mue_uno_stop(struct ifnet *ifp, int disable)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_smsc.c,v 1.80 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.81 2022/03/03 05:53:04 riastradh Exp $	*/
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
 /*-
  * Copyright (c) 2012
  *	Ben Gray <bgray@freebsd.org>.
  * 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.
 @@ -51,27 +51,27 @@
  * the H/W checksum will be incorrect, however the rx code compensates for this.
+ *
  * TX checksuming is more complicated, the device requires a special header to
  * be prefixed onto the start of the frame which indicates the start and end
  * positions of the UDP or TCP frame.  This requires the driver to manually
  * go through the packet data and decode the headers prior to sending.
  * On Linux they generally provide cues to the location of the csum and the
  * area to calculate it over, on FreeBSD we seem to have to do it all ourselves,
  * hence this is not as optimal and therefore h/w TX checksum is currently not
  * implemented.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.80 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.81 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/usbhist.h>
 #include <dev/usb/if_smscreg.h>
 #include "ioconf.h"
 @@ -401,31 +401,31 @@ smsc_uno_miibus_statchg(struct ifnet *if
 	if (err)
 		smsc_warn_printf(un, "media change failed, error %d\n", err);
+}
 static inline uint32_t
 smsc_hash(uint8_t addr[ETHER_ADDR_LEN])
+{
 	return (ether_crc32_be(addr, ETHER_ADDR_LEN) >> 26) & 0x3f;
+}
 static void
-smsc_setiff_locked(struct usbnet *un)
+smsc_uno_mcast(struct ifnet *ifp)
+{
 	USMSCHIST_FUNC(); USMSCHIST_CALLED();
 	struct usbnet * const un = ifp->if_softc;
 	struct smsc_softc * const sc = usbnet_softc(un);
 	struct ifnet * const ifp = usbnet_ifp(un);
 	struct ethercom *ec = usbnet_ec(un);
 	struct ether_multi *enm;
 	struct ether_multistep step;
 	uint32_t hashtbl[2] = { 0, 0 };
 	uint32_t hash;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return;
 	if (ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) {
 allmulti:
 @@ -558,27 +558,27 @@ smsc_uno_init(struct ifnet *ifp)
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return EIO;
 	/* Cancel pending I/O */
 	usbnet_stop(un, ifp, 1);
 	/* Reset the ethernet interface. */
 	smsc_reset(sc);
 	/* Load the multicast filter. */
-	smsc_setiff_locked(un);
+	smsc_uno_mcast(ifp);
 	/* TCP/UDP checksum offload engines. */
 	smsc_setoe_locked(un);
 	return usbnet_init_rx_tx(un);
+}
 static void
 smsc_uno_stop(struct ifnet *ifp, int disable)
+{
 	struct usbnet * const un = ifp->if_softc;
 	struct smsc_softc * const sc = usbnet_softc(un);
 @@ -747,34 +747,26 @@ smsc_uno_ioctl(struct ifnet *ifp, u_long
 	switch (cmd) {
 	case SIOCSIFCAP:
 		smsc_setoe_locked(un);
 		break;
 	default:
 		break;
+	}
 	usbnet_unlock_core(un);
 	return 0;
+}
 static void
 smsc_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const un = ifp->if_softc;
 	smsc_setiff_locked(un);
 static int
 smsc_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usb_attach_arg *uaa = aux;
 	return (usb_lookup(smsc_devs, uaa->uaa_vendor, uaa->uaa_product) != NULL) ?
 	    UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
+}
 static void
 smsc_attach(device_t parent, device_t self, void *aux)
+{
 	USBNET_MII_DECL_DEFAULT(unm);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_udav.c,v 1.85 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_udav.c,v 1.86 2022/03/03 05:53:04 riastradh Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe@nabechan.org>.  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
 @@ -35,27 +35,27 @@
  * DM9601(DAVICOM USB to Ethernet MAC Controller with Integrated 10/100 PHY)
  * The spec can be found at the following url.
  *   http://www.davicom.com.tw/big5/download/Data%20Sheet/DM9601-DS-F01-062202s.pdf
  */
 /*
  * TODO:
  *	Interrupt Endpoint support
  *	External PHYs
  *	powerhook() support?
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.85 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.86 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/if_udavreg.h>
 /* Function declarations */
 static int	udav_match(device_t, cfdata_t, void *);
 static void	udav_attach(device_t, device_t, void *);
 @@ -64,27 +64,26 @@ CFATTACH_DECL_NEW(udav, sizeof(struct us
     usbnet_detach, usbnet_activate);
 static void udav_chip_init(struct usbnet *);
 static unsigned udav_uno_tx_prepare(struct usbnet *, struct mbuf *,
 				    struct usbnet_chain *);
 static void udav_uno_rx_loop(struct usbnet *, struct usbnet_chain *, uint32_t);
 static void udav_uno_stop(struct ifnet *, int);
 static void udav_uno_mcast(struct ifnet *);
 static int udav_uno_mii_read_reg(struct usbnet *, int, int, uint16_t *);
 static int udav_uno_mii_write_reg(struct usbnet *, int, int, uint16_t);
 static void udav_uno_mii_statchg(struct ifnet *);
 static int udav_uno_init(struct ifnet *);
 static void udav_setiff_locked(struct usbnet *);
 static void udav_reset(struct usbnet *);
 static int udav_csr_read(struct usbnet *, int, void *, int);
 static int udav_csr_write(struct usbnet *, int, void *, int);
 static int udav_csr_read1(struct usbnet *, int);
 static int udav_csr_write1(struct usbnet *, int, unsigned char);
 #if 0
 static int udav_mem_read(struct usbnet *, int, void *, int);
 static int udav_mem_write(struct usbnet *, int, void *, int);
 static int udav_mem_write1(struct usbnet *, int, unsigned char);
 #endif
 @@ -491,27 +490,27 @@ udav_uno_init(struct ifnet *ifp)
 	/*  Disable loopback  */
 	UDAV_CLRBIT(un, UDAV_NCR, UDAV_NCR_LBK0 | UDAV_NCR_LBK1);
 	/* Initialize RX control register */
 	UDAV_SETBIT(un, UDAV_RCR, UDAV_RCR_DIS_LONG | UDAV_RCR_DIS_CRC);
 	/* If we want promiscuous mode, accept all physical frames. */
 	if (ifp->if_flags & IFF_PROMISC)
 		UDAV_SETBIT(un, UDAV_RCR, UDAV_RCR_ALL | UDAV_RCR_PRMSC);
 	else
 		UDAV_CLRBIT(un, UDAV_RCR, UDAV_RCR_ALL | UDAV_RCR_PRMSC);
 	/* Load the multicast filter */
-	udav_setiff_locked(un);
+	udav_uno_mcast(ifp);
 	/* Enable RX */
 	UDAV_SETBIT(un, UDAV_RCR, UDAV_RCR_RXEN);
 	/* clear POWER_DOWN state of internal PHY */
 	UDAV_SETBIT(un, UDAV_GPCR, UDAV_GPCR_GEP_CNTL0);
 	UDAV_CLRBIT(un, UDAV_GPR, UDAV_GPR_GEPIO0);
 	if (mii && (rc = mii_mediachg(mii)) == ENXIO)
 		rc = 0;
 	if (rc != 0) {
 		return rc;
 @@ -566,30 +565,30 @@ udav_chip_init(struct usbnet *un)
 		if (!(udav_csr_read1(un, UDAV_NCR) & UDAV_NCR_RST))
 			break;
 		delay(10);	/* XXX */
+	}
 	delay(10000);		/* XXX */
+}
 #define UDAV_BITS	6
 #define UDAV_CALCHASH(addr) \
 	(ether_crc32_le((addr), ETHER_ADDR_LEN) & ((1 << UDAV_BITS) - 1))
 static void
-udav_setiff_locked(struct usbnet *un)
+udav_uno_mcast(struct ifnet *ifp)
+{
 	struct usbnet * const un = ifp->if_softc;
 	struct ethercom *ec = usbnet_ec(un);
 	struct ifnet * const ifp = usbnet_ifp(un);
 	struct ether_multi *enm;
 	struct ether_multistep step;
 	uint8_t hashes[8];
 	int h = 0;
 	DPRINTF(("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return;
 	if (ISSET(un->un_flags, UDAV_NO_PHY)) {
 @@ -701,34 +700,26 @@ udav_uno_rx_loop(struct usbnet *un, stru
 	    pkt_len > total_len ||
 	    (pktstat & UDAV_RSR_ERR)) {
 		if_statinc(ifp, if_ierrors);
 		return;
+	}
 	pkt_len -= ETHER_CRC_LEN;
 	DPRINTF(("%s: Rx deliver: 0x%02x\n", device_xname(un->un_dev), pkt_len));
 	usbnet_enqueue(un, buf, pkt_len, 0, 0, 0);
+}
 static void
 udav_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const un = ifp->if_softc;
 	udav_setiff_locked(un);
 /* Stop the adapter and free any mbufs allocated to the RX and TX lists. */
 static void
 udav_uno_stop(struct ifnet *ifp, int disable)
+{
 	struct usbnet * const un = ifp->if_softc;
 	DPRINTF(("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	udav_reset(un);
+}
 static int
 udav_uno_mii_read_reg(struct usbnet *un, int phy, int reg, uint16_t *val)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ure.c,v 1.47 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_ure.c,v 1.48 2022/03/03 05:53:04 riastradh Exp $	*/
 /*	$OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $	*/
 /*-
  * Copyright (c) 2015-2016 Kevin Lo <kevlo@FreeBSD.org>
  * 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
 @@ -20,27 +20,27 @@
  * 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.
  */
 /* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.47 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.48 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/cprng.h>
 #include <net/route.h>
 #include <dev/usb/usbnet.h>
 @@ -321,30 +321,30 @@ ure_uno_miibus_statchg(struct ifnet *ifp
 			break;
 		case IFM_1000_T:
 			if ((un->un_flags & URE_FLAG_8152) != 0)
 				break;
 			usbnet_set_link(un, true);
 			break;
 		default:
 			break;
+		}
+	}
+}
 static void
-ure_rcvfilt_locked(struct usbnet *un)
+ure_uno_mcast(struct ifnet *ifp)
+{
 	struct usbnet *un = ifp->if_softc;
 	struct ethercom *ec = usbnet_ec(un);
 	struct ifnet *ifp = usbnet_ifp(un);
 	struct ether_multi *enm;
 	struct ether_multistep step;
 	uint32_t mchash[2] = { 0, 0 };
 	uint32_t h = 0, rxmode;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return;
 	rxmode = ure_read_4(un, URE_PLA_RCR, URE_MCU_TYPE_PLA);
 	rxmode &= ~(URE_RCR_AAP | URE_RCR_AM);
 	/* continue to accept my own DA and bcast frames */
 @@ -438,27 +438,27 @@ ure_uno_init(struct ifnet *ifp)
 	    ure_read_2(un, URE_PLA_FMC, URE_MCU_TYPE_PLA) |
 	    URE_FMC_FCR_MCU_EN);
 	/* Enable transmit and receive. */
 	ure_write_1(un, URE_PLA_CR, URE_MCU_TYPE_PLA,
 	    ure_read_1(un, URE_PLA_CR, URE_MCU_TYPE_PLA) | URE_CR_RE |
 	    URE_CR_TE);
 	ure_write_2(un, URE_PLA_MISC_1, URE_MCU_TYPE_PLA,
 	    ure_read_2(un, URE_PLA_MISC_1, URE_MCU_TYPE_PLA) &
 	    ~URE_RXDY_GATED_EN);
 	/* Accept multicast frame or run promisc. mode. */
-	ure_rcvfilt_locked(un);
+	ure_uno_mcast(ifp);
 	return usbnet_init_rx_tx(un);
+}
 static void
 ure_uno_stop(struct ifnet *ifp, int disable __unused)
+{
 	struct usbnet * const un = ifp->if_softc;
 	ure_reset(un);
+}
 static void
 @@ -780,34 +780,26 @@ ure_init_fifo(struct usbnet *un)
 		rx_fifo2 = URE_RXFIFO_THR3_FULL;
 	} else {
 		rx_fifo1 = URE_RXFIFO_THR2_HIGH;
 		rx_fifo2 = URE_RXFIFO_THR3_HIGH;
+	}
 	ure_write_4(un, URE_PLA_RXFIFO_CTRL1, URE_MCU_TYPE_PLA, rx_fifo1);
 	ure_write_4(un, URE_PLA_RXFIFO_CTRL2, URE_MCU_TYPE_PLA, rx_fifo2);
 	/* Configure Tx FIFO threshold. */
 	ure_write_4(un, URE_PLA_TXFIFO_CTRL, URE_MCU_TYPE_PLA,
 	    URE_TXFIFO_THR_NORMAL);
+}
 static void
 ure_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const un = ifp->if_softc;
 	ure_rcvfilt_locked(un);
 static int
 ure_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usb_attach_arg *uaa = aux;
 	return usb_lookup(ure_devs, uaa->uaa_vendor, uaa->uaa_product) != NULL ?
 	    UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
+}
 static void
 ure_attach(device_t parent, device_t self, void *aux)
+{
 	USBNET_MII_DECL_DEFAULT(unm);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_url.c,v 1.86 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: if_url.c,v 1.87 2022/03/03 05:53:04 riastradh Exp $	*/
 /*
  * Copyright (c) 2001, 2002
  *     Shingo WATANABE <nabe@nabechan.org>.  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.
 @@ -34,27 +34,27 @@
  * The RTL8150L(Realtek USB to fast ethernet controller) spec can be found at
  *   ftp://ftp.realtek.com.tw/lancard/data_sheet/8150/8150v14.pdf
  *   ftp://152.104.125.40/lancard/data_sheet/8150/8150v14.pdf
  */
 /*
  * TODO:
  *	Interrupt Endpoint support
  *	External PHYs
  *	powerhook() support?
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.86 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.87 2022/03/03 05:53:04 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <net/if_ether.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
 #endif
 @@ -67,31 +67,30 @@ __KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1
 /* Function declarations */
 static int	url_match(device_t, cfdata_t, void *);
 static void	url_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(url, sizeof(struct usbnet), url_match, url_attach,
     usbnet_detach, usbnet_activate);
 static unsigned	url_uno_tx_prepare(struct usbnet *, struct mbuf *,
 				   struct usbnet_chain *);
 static void url_uno_rx_loop(struct usbnet *, struct usbnet_chain *, uint32_t);
 static int url_uno_mii_read_reg(struct usbnet *, int, int, uint16_t *);
 static int url_uno_mii_write_reg(struct usbnet *, int, int, uint16_t);
 static void url_uno_mcast(struct ifnet *);
 static void url_uno_stop(struct ifnet *, int);
 static void url_uno_mii_statchg(struct ifnet *);
 static int url_uno_init(struct ifnet *);
-static void url_rcvfilt_locked(struct usbnet *);
+static void url_uno_mcast(struct ifnet *);
 static void url_reset(struct usbnet *);
 static int url_csr_read_1(struct usbnet *, int);
 static int url_csr_read_2(struct usbnet *, int);
 static int url_csr_write_1(struct usbnet *, int, int);
 static int url_csr_write_2(struct usbnet *, int, int);
 static int url_csr_write_4(struct usbnet *, int, int);
 static int url_mem(struct usbnet *, int, int, void *, int);
 static const struct usbnet_ops url_ops = {
 	.uno_stop = url_uno_stop,
 	.uno_mcast = url_uno_mcast,
 	.uno_read_reg = url_uno_mii_read_reg,
 @@ -383,27 +382,27 @@ url_uno_init(struct ifnet *ifp)
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
 		url_csr_write_1(un, URL_IDR0 + i, eaddr[i]);
 	/* Init transmission control register */
 	URL_CLRBIT(un, URL_TCR,
 		   URL_TCR_TXRR1 | URL_TCR_TXRR0 |
 		   URL_TCR_IFG1 | URL_TCR_IFG0 |
 		   URL_TCR_NOCRC);
 	/* Init receive control register */
 	URL_SETBIT2(un, URL_RCR, URL_RCR_TAIL | URL_RCR_AD | URL_RCR_AB);
 	/* Accept multicast frame or run promisc. mode */
-	url_rcvfilt_locked(un);
+	url_uno_mcast(ifp);
 	/* Enable RX and TX */
 	URL_SETBIT(un, URL_CR, URL_CR_TE | URL_CR_RE);
 	return usbnet_init_rx_tx(un);
+}
 static void
 url_reset(struct usbnet *un)
+{
 	int i;
 	DPRINTF(("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 @@ -415,29 +414,29 @@ url_reset(struct usbnet *un)
 	for (i = 0; i < URL_TX_TIMEOUT; i++) {
 		if (usbnet_isdying(un))
 			return;
 		if (!(url_csr_read_1(un, URL_CR) & URL_CR_SOFT_RST))
 			break;
 		delay(10);	/* XXX */
+	}
 	delay(10000);		/* XXX */
+}
 static void
-url_rcvfilt_locked(struct usbnet *un)
+url_uno_mcast(struct ifnet *ifp)
+{
-	struct ifnet * const ifp = usbnet_ifp(un);
+	struct usbnet * const un = ifp->if_softc;
 	struct ethercom *ec = usbnet_ec(un);
 	struct ether_multi *enm;
 	struct ether_multistep step;
 	uint32_t mchash[2] = { 0, 0 };
 	int h = 0, rcr;
 	DPRINTF(("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return;
 @@ -535,34 +534,26 @@ url_uno_rx_loop(struct usbnet *un, struc
 	total_len -= ETHER_CRC_LEN;
 	DPRINTF(("%s: %s: deliver %d\n", device_xname(un->un_dev),
 		 __func__, total_len));
 	usbnet_enqueue(un, c->unc_buf, total_len, 0, 0, 0);
+}
 #if 0
 static void url_intr(void)
+{
+}
 #endif
 static void
 url_uno_mcast(struct ifnet *ifp)
 	struct usbnet * const un = ifp->if_softc;
 	url_rcvfilt_locked(un);
 /* Stop the adapter and free any mbufs allocated to the RX and TX lists. */
 static void
 url_uno_stop(struct ifnet *ifp, int disable)
+{
 	struct usbnet * const un = ifp->if_softc;
 	DPRINTF(("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	url_reset(un);
+}
 static int
 url_uno_mii_read_reg(struct usbnet *un, int phy, int reg, uint16_t *val)