 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbnet.c,v 1.73 2022/03/03 05:50:39 riastradh Exp $	*/
+/*	$NetBSD: usbnet.c,v 1.74 2022/03/03 05:50:47 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.73 2022/03/03 05:50:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.74 2022/03/03 05:50:47 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;
 @@ -1065,46 +1065,42 @@ usbnet_if_ioctl(struct ifnet *ifp, u_lon
 		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 usbnet_private * const unp = un->un_pri;
 	struct ifnet * const ifp = usbnet_ifp(un);
 	bool dying;
 	struct ifreq ifr;
-	USBNETHIST_CALLARGSN(10, "%jd: enter", unp->unp_number, 0, 0, 0);
+	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.
 	 */
-	mutex_enter(&unp->unp_core_lock);
+	if (usbnet_isdying(un))
 	dying = usbnet_isdying(un);
 	mutex_exit(&unp->unp_core_lock);
 	if (dying)
 		return;
 	/*
 	 * Pass a bogus ifr with SIOCDELMULTI -- the goal is to just
 	 * notify the driver to reprogram any hardware multicast
 	 * filter, according to what's already stored in the ethercom.
 	 * None of the drivers actually examine this argument, so it
 	 * doesn't change the ABI as far as they can tell.
 	 */
 	IFNET_LOCK(ifp);
 	if (ifp->if_flags & IFF_RUNNING) {
 		memset(&ifr, 0, sizeof(ifr));
 		(void)uno_ioctl(un, ifp, SIOCDELMULTI, &ifr);
 @@ -1278,39 +1274,35 @@ usbnet_tick_task(void *arg)
 	uno_tick(un);
 	mutex_enter(&unp->unp_core_lock);
 	if (!unp->unp_stopping && !usbnet_isdying(un))
 		callout_schedule(&unp->unp_stat_ch, hz);
 	mutex_exit(&unp->unp_core_lock);
+}
 static int
 usbnet_if_init(struct ifnet *ifp)
+{
 	USBNETHIST_FUNC(); USBNETHIST_CALLED();
 	struct usbnet * const un = ifp->if_softc;
 	bool dying;
 	int error;
 	KASSERTMSG(IFNET_LOCKED(ifp), "%s", ifp->if_xname);
 	/*
 	 * Prevent anyone from bringing the interface back up once
 	 * we're detaching.
 	 */
-	mutex_enter(&un->un_pri->unp_core_lock);
+	if (usbnet_isdying(un))
 	dying = usbnet_isdying(un);
 	mutex_exit(&un->un_pri->unp_core_lock);
 	if (dying)
 		return EIO;
 	mutex_enter(&un->un_pri->unp_core_lock);
 	error = uno_init(un, ifp);
 	mutex_exit(&un->un_pri->unp_core_lock);
 	return error;
+}
 /* Various accessors. */
 void
 @@ -1581,29 +1573,27 @@ usbnet_detach(device_t self, int flags)
 	struct usbnet_private * const unp = un->un_pri;
 	/* Detached before attached finished, so just bail out. */
 	if (unp == NULL || !unp->unp_attached)
 		return 0;
 	struct ifnet * const ifp = usbnet_ifp(un);
 	struct mii_data * const mii = usbnet_mii(un);
 	/*
 	 * Prevent new activity.  After we stop the interface, it
 	 * cannot be brought back up.
 	 */
 	mutex_enter(&unp->unp_core_lock);
 	atomic_store_relaxed(&unp->unp_dying, true);
 	mutex_exit(&unp->unp_core_lock);
 	/*
 	 * If we're still running on the network, stop and wait for all
 	 * asynchronous activity to finish.
+	 *
 	 * If usbnet_attach_ifp never ran, IFNET_LOCK won't work, but
 	 * no activity is possible, so just skip this part.
 	 */
 	if (unp->unp_ifp_attached) {
 		IFNET_LOCK(ifp);
 		if (ifp->if_flags & IFF_RUNNING) {
 			usbnet_if_stop(ifp, 1);
+		}
 @@ -1710,29 +1700,27 @@ usbnet_detach(device_t self, int flags)
 int
 usbnet_activate(device_t self, devact_t act)
+{
 	USBNETHIST_FUNC(); USBNETHIST_CALLED();
 	struct usbnet * const un = device_private(self);
 	struct usbnet_private * const unp = un->un_pri;
 	struct ifnet * const ifp = usbnet_ifp(un);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		if_deactivate(ifp);
 		mutex_enter(&unp->unp_core_lock);
 		atomic_store_relaxed(&unp->unp_dying, true);
 		mutex_exit(&unp->unp_core_lock);
 		mutex_enter(&unp->unp_rxlock);
 		mutex_enter(&unp->unp_txlock);
 		unp->unp_stopping = true;
 		mutex_exit(&unp->unp_txlock);
 		mutex_exit(&unp->unp_rxlock);
 		return 0;
 	default:
 		return EOPNOTSUPP;
+	}
+}