 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_aue.c,v 1.180 2022/03/03 05:53:14 riastradh Exp $	*/
+/*	$NetBSD: if_aue.c,v 1.181 2022/03/03 05:53:23 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.180 2022/03/03 05:53:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.181 2022/03/03 05:53:23 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
 @@ -274,28 +274,26 @@ static int aue_csr_write_2(struct aue_so
 	aue_csr_write_1(sc, reg, aue_csr_read_1(sc, reg) | (x))
 #define AUE_CLRBIT(sc, reg, x)				\
 	aue_csr_write_1(sc, reg, aue_csr_read_1(sc, reg) & ~(x))
 static int
 aue_csr_read_1(struct aue_softc *sc, int reg)
+{
 	struct usbnet * const	un = &sc->aue_un;
 	usb_device_request_t	req;
 	usbd_status		err;
 	uByte			val = 0;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return 0;
 	req.bmRequestType = UT_READ_VENDOR_DEVICE;
 	req.bRequest = AUE_UR_READREG;
 	USETW(req.wValue, 0);
 	USETW(req.wIndex, reg);
 	USETW(req.wLength, 1);
 	err = usbd_do_request(un->un_udev, &req, &val);
 	if (err) {
 		AUEHIST_FUNC();
 @@ -305,28 +303,26 @@ aue_csr_read_1(struct aue_softc *sc, int
+	}
 	return val;
+}
 static int
 aue_csr_read_2(struct aue_softc *sc, int reg)
+{
 	struct usbnet * const	un = &sc->aue_un;
 	usb_device_request_t	req;
 	usbd_status		err;
 	uWord			val;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return 0;
 	req.bmRequestType = UT_READ_VENDOR_DEVICE;
 	req.bRequest = AUE_UR_READREG;
 	USETW(req.wValue, 0);
 	USETW(req.wIndex, reg);
 	USETW(req.wLength, 2);
 	err = usbd_do_request(un->un_udev, &req, &val);
 	if (err) {
 		AUEHIST_FUNC();
 @@ -336,28 +332,26 @@ aue_csr_read_2(struct aue_softc *sc, int
+	}
 	return UGETW(val);
+}
 static int
 aue_csr_write_1(struct aue_softc *sc, int reg, int aval)
+{
 	struct usbnet * const	un = &sc->aue_un;
 	usb_device_request_t	req;
 	usbd_status		err;
 	uByte			val;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return 0;
 	val = aval;
 	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	req.bRequest = AUE_UR_WRITEREG;
 	USETW(req.wValue, val);
 	USETW(req.wIndex, reg);
 	USETW(req.wLength, 1);
 	err = usbd_do_request(un->un_udev, &req, &val);
 	if (err) {
 @@ -368,28 +362,26 @@ aue_csr_write_1(struct aue_softc *sc, in
+	}
 	return 0;
+}
 static int
 aue_csr_write_2(struct aue_softc *sc, int reg, int aval)
+{
 	struct usbnet * const	un = &sc->aue_un;
 	usb_device_request_t	req;
 	usbd_status		err;
 	uWord			val;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return 0;
 	USETW(val, aval);
 	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	req.bRequest = AUE_UR_WRITEREG;
 	USETW(req.wValue, aval);
 	USETW(req.wIndex, reg);
 	USETW(req.wLength, 2);
 	err = usbd_do_request(un->un_udev, &req, &val);
 	if (err) {
 @@ -614,28 +606,26 @@ static void
 aue_uno_mcast(struct ifnet *ifp)
+{
 	struct usbnet * const un = ifp->if_softc;
 	struct aue_softc * const sc = usbnet_softc(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) {
 		ETHER_LOCK(ec);
 allmulti:
 		ec->ec_flags |= ETHER_F_ALLMULTI;
 		ETHER_UNLOCK(ec);
 		AUE_SETBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI);
 		return;
+	}
 	/* now program new ones */
 	ETHER_LOCK(ec);
 	ETHER_FIRST_MULTI(step, ec, enm);
 	while (enm != NULL) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_axe.c,v 1.141 2022/03/03 05:53:04 riastradh Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.142 2022/03/03 05:53:23 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.141 2022/03/03 05:53:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.142 2022/03/03 05:53:23 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 {
 @@ -283,28 +283,26 @@ static const struct usbnet_ops axe_ops =
 	.uno_tx_prepare = axe_uno_tx_prepare,
 	.uno_rx_loop = axe_uno_rx_loop,
 	.uno_init = axe_uno_init,
 };
 static usbd_status
 axe_cmd(struct axe_softc *sc, int cmd, int index, int val, void *buf)
+{
 	AXEHIST_FUNC(); AXEHIST_CALLED();
 	struct usbnet * const un = &sc->axe_un;
 	usb_device_request_t req;
 	usbd_status err;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return -1;
 	DPRINTFN(20, "cmd %#jx index %#jx val %#jx", cmd, index, val, 0);
 	if (AXE_CMD_DIR(cmd))
 		req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	else
 		req.bmRequestType = UT_READ_VENDOR_DEVICE;
 	req.bRequest = AXE_CMD_CMD(cmd);
 	USETW(req.wValue, val);
 	USETW(req.wIndex, index);
 	USETW(req.wLength, AXE_CMD_LEN(cmd));

 @@ -1,39 +1,39 @@
-/*	$NetBSD: if_axen.c,v 1.83 2022/03/03 05:53:04 riastradh Exp $	*/
+/*	$NetBSD: if_axen.c,v 1.84 2022/03/03 05:53:23 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.83 2022/03/03 05:53:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.84 2022/03/03 05:53:23 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>
 @@ -98,28 +98,26 @@ static const struct usbnet_ops axen_ops
 	.uno_write_reg = axen_uno_mii_write_reg,
 	.uno_statchg = axen_uno_mii_statchg,
 	.uno_tx_prepare = axen_uno_tx_prepare,
 	.uno_rx_loop = axen_uno_rx_loop,
 	.uno_init = axen_uno_init,
 };
 static int
 axen_cmd(struct usbnet *un, int cmd, int index, int val, void *buf)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return 0;
 	if (AXEN_CMD_DIR(cmd))
 		req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	else
 		req.bmRequestType = UT_READ_VENDOR_DEVICE;
 	req.bRequest = AXEN_CMD_CMD(cmd);
 	USETW(req.wValue, val);
 	USETW(req.wIndex, index);
 	USETW(req.wLength, AXEN_CMD_LEN(cmd));
 	err = usbd_do_request(un->un_udev, &req, buf);
 @@ -229,28 +227,26 @@ axen_uno_mcast(struct ifnet *ifp)
+{
 	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);
 	rxmode = 0;
 	/* Enable receiver, set RX mode */
 	axen_cmd(un, AXEN_CMD_MAC_READ2, 2, AXEN_MAC_RXCTL, &wval);
 	rxmode = le16toh(wval);
 	rxmode &= ~(AXEN_RXCTL_ACPT_ALL_MCAST | AXEN_RXCTL_PROMISC |
 	    AXEN_RXCTL_ACPT_MCAST);
 	if (ifp->if_flags & IFF_PROMISC) {
 		DPRINTF(("%s: promisc\n", device_xname(un->un_dev)));
 		rxmode |= AXEN_RXCTL_PROMISC;
 allmulti:
 		ETHER_LOCK(ec);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_smsc.c,v 1.82 2022/03/03 05:53:14 riastradh Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.83 2022/03/03 05:53:23 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.82 2022/03/03 05:53:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.83 2022/03/03 05:53:23 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"
 @@ -201,55 +201,51 @@ static const struct usbnet_ops smsc_ops
 	.uno_statchg = smsc_uno_miibus_statchg,
 	.uno_tx_prepare = smsc_uno_tx_prepare,
 	.uno_rx_loop = smsc_uno_rx_loop,
 	.uno_init = smsc_uno_init,
 };
 static int
 smsc_readreg(struct usbnet *un, uint32_t off, uint32_t *data)
+{
 	usb_device_request_t req;
 	uint32_t buf;
 	usbd_status err;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return 0;
 	req.bmRequestType = UT_READ_VENDOR_DEVICE;
 	req.bRequest = SMSC_UR_READ_REG;
 	USETW(req.wValue, 0);
 	USETW(req.wIndex, off);
 	USETW(req.wLength, 4);
 	err = usbd_do_request(un->un_udev, &req, &buf);
 	if (err != 0)
 		smsc_warn_printf(un, "Failed to read register 0x%0x\n", off);
 	*data = le32toh(buf);
 	return err;
+}
 static int
 smsc_writereg(struct usbnet *un, uint32_t off, uint32_t data)
+{
 	usb_device_request_t req;
 	uint32_t buf;
 	usbd_status err;
 	usbnet_isowned_core(un);
 	if (usbnet_isdying(un))
 		return 0;
 	buf = htole32(data);
 	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	req.bRequest = SMSC_UR_WRITE_REG;
 	USETW(req.wValue, 0);
 	USETW(req.wIndex, off);
 	USETW(req.wLength, 4);
 	err = usbd_do_request(un->un_udev, &req, &buf);
 	if (err != 0)
 @@ -412,28 +408,26 @@ smsc_hash(uint8_t addr[ETHER_ADDR_LEN])
 static void
 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 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_PROMISC) {
 		ETHER_LOCK(ec);
 allmulti:
 		ec->ec_flags |= ETHER_F_ALLMULTI;
 		ETHER_UNLOCK(ec);
 		DPRINTF("receive all multicast enabled", 0, 0, 0, 0);
 		sc->sc_mac_csr |= SMSC_MAC_CSR_MCPAS;
 		sc->sc_mac_csr &= ~SMSC_MAC_CSR_HPFILT;
 		smsc_writereg(un, SMSC_MAC_CSR, sc->sc_mac_csr);
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_udav.c,v 1.87 2022/03/03 05:53:14 riastradh Exp $	*/
+/*	$NetBSD: if_udav.c,v 1.88 2022/03/03 05:53:23 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.87 2022/03/03 05:53:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.88 2022/03/03 05:53:23 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 *);
 @@ -354,27 +354,26 @@ udav_mem_write1(struct usbnet *un, int o
+	}
 	return err;
+}
 #endif
 /* read register(s) */
 static int
 udav_csr_read(struct usbnet *un, int offset, void *buf, int len)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	usbnet_isowned_core(un);
 	KASSERT(!usbnet_isdying(un));
 	DPRINTFN(0x200,
 		("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	offset &= 0xff;
 	len &= 0xff;
 	req.bmRequestType = UT_READ_VENDOR_DEVICE;
 	req.bRequest = UDAV_REQ_REG_READ;
 	USETW(req.wValue, 0x0000);
 	USETW(req.wIndex, offset);
 	USETW(req.wLength, len);
 @@ -385,27 +384,26 @@ udav_csr_read(struct usbnet *un, int off
 			 device_xname(un->un_dev), __func__, offset, err));
+	}
 	return err;
+}
 /* write register(s) */
 static int
 udav_csr_write(struct usbnet *un, int offset, void *buf, int len)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	usbnet_isowned_core(un);
 	KASSERT(!usbnet_isdying(un));
 	DPRINTFN(0x200,
 		("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	offset &= 0xff;
 	len &= 0xff;
 	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	req.bRequest = UDAV_REQ_REG_WRITE;
 	USETW(req.wValue, 0x0000);
 	USETW(req.wIndex, offset);
 	USETW(req.wLength, len);
 @@ -414,45 +412,42 @@ udav_csr_write(struct usbnet *un, int of
 	if (err) {
 		DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
 			 device_xname(un->un_dev), __func__, offset, err));
+	}
 	return err;
+}
 static int
 udav_csr_read1(struct usbnet *un, int offset)
+{
 	uint8_t val = 0;
 	usbnet_isowned_core(un);
 	DPRINTFN(0x200,
 		("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	if (usbnet_isdying(un))
 		return 0;
 	return udav_csr_read(un, offset, &val, 1) ? 0 : val;
+}
 /* write a register */
 static int
 udav_csr_write1(struct usbnet *un, int offset, unsigned char ch)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	usbnet_isowned_core(un);
 	KASSERT(!usbnet_isdying(un));
 	DPRINTFN(0x200,
 		("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	offset &= 0xff;
 	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	req.bRequest = UDAV_REQ_REG_WRITE1;
 	USETW(req.wValue, ch);
 	USETW(req.wIndex, offset);
 	USETW(req.wLength, 0x0000);
 @@ -576,28 +571,26 @@ udav_chip_init(struct usbnet *un)
 static void
 udav_uno_mcast(struct ifnet *ifp)
+{
 	struct usbnet * const un = ifp->if_softc;
 	struct ethercom *ec = usbnet_ec(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)) {
 		UDAV_SETBIT(un, UDAV_RCR, UDAV_RCR_ALL);
 		UDAV_SETBIT(un, UDAV_RCR, UDAV_RCR_PRMSC);
 		return;
+	}
 	if (ifp->if_flags & IFF_PROMISC) {
 		ETHER_LOCK(ec);
 		ec->ec_flags |= ETHER_F_ALLMULTI;
 		ETHER_UNLOCK(ec);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_url.c,v 1.87 2022/03/03 05:53:04 riastradh Exp $	*/
+/*	$NetBSD: if_url.c,v 1.88 2022/03/03 05:53:23 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.87 2022/03/03 05:53:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.88 2022/03/03 05:53:23 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
 @@ -258,28 +258,26 @@ url_attach(device_t parent, device_t sel
 	/* initialize interface information */
 	usbnet_attach_ifp(un, IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST,
 , &unm);
+}
 /* read/write memory */
 static int
 url_mem(struct usbnet *un, int cmd, int offset, void *buf, int len)
+{
 	usb_device_request_t req;
 	usbd_status err;
 	usbnet_isowned_core(un);
 	DPRINTFN(0x200,
 		("%s: %s: enter\n", device_xname(un->un_dev), __func__));
 	if (usbnet_isdying(un))
 		return 0;
 	if (cmd == URL_CMD_READMEM)
 		req.bmRequestType = UT_READ_VENDOR_DEVICE;
 	else
 		req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 	req.bRequest = URL_REQ_MEM;
 	USETW(req.wValue, offset);
 	USETW(req.wIndex, 0x0000);
 @@ -425,28 +423,26 @@ url_reset(struct usbnet *un)
 static void
 url_uno_mcast(struct ifnet *ifp)
+{
 	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;
 	rcr = url_csr_read_2(un, URL_RCR);
 	rcr &= ~(URL_RCR_AAP | URL_RCR_AAM | URL_RCR_AM);
 	ETHER_LOCK(ec);
 	if (ifp->if_flags & IFF_PROMISC) {
 		ec->ec_flags |= ETHER_F_ALLMULTI;
 		ETHER_UNLOCK(ec);
 		/* run promisc. mode */
 		rcr |= URL_RCR_AAM; /* ??? */
 		rcr |= URL_RCR_AAP;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ure.c,v 1.48 2022/03/03 05:53:04 riastradh Exp $	*/
+/*	$NetBSD: if_ure.c,v 1.49 2022/03/03 05:53:23 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.48 2022/03/03 05:53:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.49 2022/03/03 05:53:23 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>
 @@ -330,28 +330,26 @@ ure_uno_miibus_statchg(struct ifnet *ifp
+	}
+}
 static void
 ure_uno_mcast(struct ifnet *ifp)
+{
 	struct usbnet *un = ifp->if_softc;
 	struct ethercom *ec = usbnet_ec(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 */
 	ETHER_LOCK(ec);
 	if (ifp->if_flags & IFF_PROMISC) {
 		ec->ec_flags |= ETHER_F_ALLMULTI;
 		ETHER_UNLOCK(ec);
 		/* run promisc. mode */
 		rxmode |= URE_RCR_AM;	/* ??? */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbnet.c,v 1.81 2022/03/03 05:52:46 riastradh Exp $	*/
+/*	$NetBSD: usbnet.c,v 1.82 2022/03/03 05:53:23 riastradh Exp $	*/
 /*
  * Copyright (c) 2019 Matthew R. Green
  * 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * Common code shared between USB network drivers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.81 2022/03/03 05:52:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.82 2022/03/03 05:53:23 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/atomic.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/usbhist.h>
 struct usbnet_cdata {
 	struct usbnet_chain	*uncd_tx_chain;
 	struct usbnet_chain	*uncd_rx_chain;
 @@ -49,38 +49,41 @@ struct usbnet_cdata {
 	int			uncd_tx_prod;
 	int			uncd_tx_cnt;
 };
 struct usbnet_private {
 	/*
 	 * - unp_core_lock protects most of this structure, the public one,
 	 *   and the MII / media data.
 	 * - unp_rxlock protects the rx path and its data
 	 * - unp_txlock protects the tx path and its data
+	 *
 	 * the lock ordering is:
 	 *	ifnet lock -> unp_core_lock -> unp_rxlock -> unp_txlock
 	 *				    -> unp_mcastlock
 	 * - ifnet lock is not needed for unp_core_lock, but if ifnet lock is
 	 *   involved, it must be taken first
 	 */
 	kmutex_t		unp_core_lock;
 	kmutex_t		unp_rxlock;
 	kmutex_t		unp_txlock;
 	kmutex_t		unp_mcastlock;
 	bool			unp_mcastactive;
 	struct usbnet_cdata	unp_cdata;
 	struct ethercom		unp_ec;
 	struct mii_data		unp_mii;
 	struct usb_task		unp_mcasttask;
 	struct usb_task		unp_ticktask;
 	struct callout		unp_stat_ch;
 	struct usbd_pipe	*unp_ep[USBNET_ENDPT_MAX];
 	volatile bool		unp_dying;
 	bool			unp_stopping;
 	bool			unp_attached;
 	bool			unp_ifp_attached;
 	bool			unp_link;
 	int			unp_timer;
 	unsigned short		unp_if_flags;
 	unsigned		unp_number;
 @@ -856,26 +859,37 @@ usbnet_init_rx_tx(struct usbnet * const
 	/* Init TX ring. */
 	if (usbnet_tx_list_init(un)) {
 		aprint_error_dev(un->un_dev, "tx list init failed\n");
 		error = ENOBUFS;
 		goto out;
+	}
 	/* Indicate we are up and running. */
 	/* XXX urndis calls usbnet_init_rx_tx before usbnet_attach_ifp.  */
 	KASSERTMSG(!unp->unp_ifp_attached || IFNET_LOCKED(ifp),
 	    "%s", ifp->if_xname);
 	ifp->if_flags |= IFF_RUNNING;
 	/*
 	 * If the hardware has a multicast filter, program it and then
 	 * allow updates to it while we're running.
 	 */
 	if (un->un_ops->uno_mcast) {
 		mutex_enter(&unp->unp_mcastlock);
 		(*un->un_ops->uno_mcast)(ifp);
 		unp->unp_mcastactive = true;
 		mutex_exit(&unp->unp_mcastlock);
+	}
 	/* Start up the receive pipe(s). */
 	usbnet_rx_start_pipes(un);
 	callout_schedule(&unp->unp_stat_ch, hz);
 out:
 	if (error) {
 		usbnet_rx_list_fini(un);
 		usbnet_tx_list_fini(un);
 		usbnet_ep_close_pipes(un);
+	}
 	usbnet_isowned_core(un);
 @@ -1008,102 +1022,87 @@ usbnet_if_ioctl(struct ifnet *ifp, u_lon
 	int error;
 	USBNETHIST_CALLARGSN(11, "%jd: enter %#jx data %#jx",
 	    unp->unp_number, cmd, (uintptr_t)data, 0);
 	if (un->un_ops->uno_override_ioctl)
 		return uno_override_ioctl(un, ifp, cmd, data);
 	error = ether_ioctl(ifp, cmd, data);
 	if (error == ENETRESET) {
 		switch (cmd) {
 		case SIOCADDMULTI:
 		case SIOCDELMULTI:
-			usb_add_task(un->un_udev, &unp->unp_mcasttask,
+			/*
-			    USB_TASKQ_DRIVER);
+			 * If there's a hardware multicast filter, and
 			 * it has been programmed by usbnet_init_rx_tx
 			 * and is active, update it now.  Otherwise,
 			 * drop the update on the floor -- it will be
 			 * observed by usbnet_init_rx_tx next time we
 			 * bring the interface up.
 			 */
 			if (un->un_ops->uno_mcast) {
 				mutex_enter(&unp->unp_mcastlock);
 				if (unp->unp_mcastactive)
 					(*un->un_ops->uno_mcast)(ifp);
 				mutex_exit(&unp->unp_mcastlock);
+			}
 			error = 0;
 			break;
 		default:
 			error = uno_ioctl(un, ifp, cmd, data);
+		}
+	}
 	return error;
+}
 static void
 usbnet_mcast_task(void *arg)
 	USBNETHIST_FUNC();
 	struct usbnet * const un = arg;
 	struct ifnet * const ifp = usbnet_ifp(un);
 	USBNETHIST_CALLARGSN(10, "%jd: enter",
 	    un->un_pri->unp_number, 0, 0, 0);
 	/*
 	 * If we're detaching, we must check usbnet_isdying _before_
 	 * touching IFNET_LOCK -- the ifnet may have been detached by
 	 * the time this task runs.  This is racy -- unp_dying may be
 	 * set immediately after we test it -- but nevertheless safe,
 	 * because usbnet_detach waits for the task to complete before
 	 * issuing if_detach, and necessary, so that we don't touch
 	 * IFNET_LOCK after if_detach.  See usbnet_detach for details.
 	 */
 	if (usbnet_isdying(un))
 		return;
 	/*
 	 * If the hardware is running, ask the driver to reprogram the
 	 * multicast filter.  If the hardware is not running, the
 	 * driver is responsible for programming the multicast filter
 	 * as part of its uno_init routine to bring the hardware up.
 	 */
 	IFNET_LOCK(ifp);
 	if (ifp->if_flags & IFF_RUNNING) {
 		if (un->un_ops->uno_mcast) {
 			mutex_enter(&un->un_pri->unp_core_lock);
 			(*un->un_ops->uno_mcast)(ifp);
 			mutex_exit(&un->un_pri->unp_core_lock);
 	IFNET_UNLOCK(ifp);
 /*
  * Generic stop network function:
  *	- mark as stopping
  *	- call DD routine to stop the device
  *	- turn off running, timer, statchg callout, link
  *	- stop transfers
  *	- free RX and TX resources
  *	- close pipes
+ *
  * usbnet_stop() is exported for drivers to use, expects lock held.
+ *
  * usbnet_if_stop() is for the if_stop handler.
  */
 void
 usbnet_stop(struct usbnet *un, struct ifnet *ifp, int disable)
+{
 	struct usbnet_private * const unp = un->un_pri;
 	USBNETHIST_FUNC(); USBNETHIST_CALLED();
 	KASSERTMSG(!unp->unp_ifp_attached || IFNET_LOCKED(ifp),
 	    "%s", ifp->if_xname);
 	usbnet_isowned_core(un);
 	/*
 	 * For drivers with hardware multicast filter update callbacks:
 	 * Prevent concurrent access to the hardware registers by
 	 * multicast filter updates, which happens without IFNET_LOCK
 	 * or the usbnet core lock.
 	 */
 	if (un->un_ops->uno_mcast) {
 		mutex_enter(&unp->unp_mcastlock);
 		unp->unp_mcastactive = false;
 		mutex_exit(&unp->unp_mcastlock);
+	}
 	/*
 	 * Prevent new activity (rescheduling ticks, xfers, &c.) and
 	 * clear the watchdog timer.
 	 */
 	mutex_enter(&unp->unp_rxlock);
 	mutex_enter(&unp->unp_txlock);
 	unp->unp_stopping = true;
 	unp->unp_timer = 0;
 	mutex_exit(&unp->unp_txlock);
 	mutex_exit(&unp->unp_rxlock);
 	/*
 	 * Stop the timer first, then the task -- if the timer was
 	 * already firing, we stop the task or wait for it complete
 @@ -1377,36 +1376,35 @@ usbnet_attach(struct usbnet *un,
 	KASSERT(un->un_ops->uno_rx_loop);
 	KASSERT(un->un_ops->uno_init);
 	KASSERT(un->un_rx_bufsz);
 	KASSERT(un->un_tx_bufsz);
 	KASSERT(un->un_rx_list_cnt);
 	KASSERT(un->un_tx_list_cnt);
 	/* Unfortunate fact.  */
 	KASSERT(un == device_private(un->un_dev));
 	un->un_pri = kmem_zalloc(sizeof(*un->un_pri), KM_SLEEP);
 	struct usbnet_private * const unp = un->un_pri;
 	usb_init_task(&unp->unp_mcasttask, usbnet_mcast_task, un,
 	    USB_TASKQ_MPSAFE);
 	usb_init_task(&unp->unp_ticktask, usbnet_tick_task, un,
 	    USB_TASKQ_MPSAFE);
 	callout_init(&unp->unp_stat_ch, CALLOUT_MPSAFE);
 	callout_setfunc(&unp->unp_stat_ch, usbnet_tick, un);
 	mutex_init(&unp->unp_txlock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	mutex_init(&unp->unp_rxlock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	mutex_init(&unp->unp_core_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&unp->unp_mcastlock, MUTEX_DEFAULT, IPL_SOFTCLOCK);
 	rnd_attach_source(&unp->unp_rndsrc, device_xname(un->un_dev),
 	    RND_TYPE_NET, RND_FLAG_DEFAULT);
 	usbnet_rx_list_alloc(un);
 	usbnet_tx_list_alloc(un);
 	unp->unp_number = atomic_inc_uint_nv(&usbnet_number);
 	unp->unp_attached = true;
+}
 static void
 @@ -1529,81 +1527,45 @@ usbnet_detach(device_t self, int flags)
 		if (ifp->if_flags & IFF_RUNNING) {
 			usbnet_if_stop(ifp, 1);
+		}
 		IFNET_UNLOCK(ifp);
+	}
 	/*
 	 * The callout and tick task can't be scheduled anew at this
 	 * point, and usbnet_if_stop has waited for them to complete.
 	 */
 	KASSERT(!callout_pending(&unp->unp_stat_ch));
 	KASSERT(!usb_task_pending(un->un_udev, &unp->unp_ticktask));
 	usb_rem_task_wait(un->un_udev, &unp->unp_mcasttask, USB_TASKQ_DRIVER,
 	    NULL);
 	if (mii) {
 		mii_detach(mii, MII_PHY_ANY, MII_OFFSET_ANY);
 		ifmedia_fini(&mii->mii_media);
+	}
 	if (unp->unp_ifp_attached) {
 		if (!usbnet_empty_eaddr(un))
 			ether_ifdetach(ifp);
 		else
 			bpf_detach(ifp);
 		if_detach(ifp);
+	}
 	usbnet_ec(un)->ec_mii = NULL;
 	/*
 	 * We have already waited for the multicast task to complete.
 	 * Unfortunately, until if_detach, nothing has prevented it
 	 * from running again -- another thread might issue if_mcast_op
 	 * between the time of our first usb_rem_task_wait and the time
 	 * we actually get around to if_detach.
 	 * Fortunately, the first usb_rem_task_wait ensures that if the
 	 * task is scheduled again, it will witness our setting of
 	 * unp_dying to true[*].  So after that point, if the task is
 	 * scheduled again, it will decline to touch IFNET_LOCK and do
 	 * nothing.  But we still need to wait for it to complete.
 	 * It would be nice if we could write
 	 *	if_pleasestopissuingmcastopsthanks(ifp);
 	 *	usb_rem_task_wait(..., &unp->unp_mcasttask, ...);
 	 *	if_detach(ifp);
 	 * and then we would need only one usb_rem_task_wait.
 	 * Unfortunately, there is no such operation available in
 	 * sys/net at the moment, and it would require a bit of
 	 * coordination with if_mcast_op and doifioctl probably under a
 	 * new lock.  So we'll use this kludge until that mechanism is
 	 * invented.
 	 * [*] This is not exactly a documented property of the API,
 	 * but it is implied by the single lock in the task queue
 	 * serializing changes to the task state.
 	 */
 	usb_rem_task_wait(un->un_udev, &unp->unp_mcasttask, USB_TASKQ_DRIVER,
 	    NULL);
 	usbnet_rx_list_free(un);
 	usbnet_tx_list_free(un);
 	rnd_detach_source(&unp->unp_rndsrc);
 	mutex_destroy(&unp->unp_mcastlock);
 	mutex_destroy(&unp->unp_core_lock);
 	mutex_destroy(&unp->unp_rxlock);
 	mutex_destroy(&unp->unp_txlock);
 	callout_destroy(&unp->unp_stat_ch);
 	pmf_device_deregister(un->un_dev);
 	/*
 	 * Notify userland that we're going away, if we arrived in the
 	 * first place.
 	 */
 	if (unp->unp_ifp_attached) {