 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbnet.c,v 1.47 2022/03/03 05:47:06 riastradh Exp $	*/
+/*	$NetBSD: usbnet.c,v 1.48 2022/03/03 05:47:14 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.47 2022/03/03 05:47:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.48 2022/03/03 05:47:14 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;
 @@ -70,26 +70,27 @@ struct usbnet_private {
 	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];
 	bool			unp_dying;
 	bool			unp_stopping;
 	bool			unp_attached;
 	bool			unp_ifp_attached;
 	bool			unp_link;
 	int			unp_refcnt;
 	int			unp_timer;
 	unsigned short		unp_if_flags;
 	unsigned		unp_number;
 	krndsource_t		unp_rndsrc;
 	struct timeval		unp_rx_notice;
 	struct timeval		unp_tx_notice;
 	struct timeval		unp_intr_notice;
 };
 @@ -1482,63 +1483,65 @@ usbnet_attach_mii(struct usbnet *un, con
+}
 void
 usbnet_attach_ifp(struct usbnet *un,
 		  unsigned if_flags,		/* additional if_flags */
 		  unsigned if_extflags,		/* additional if_extflags */
 		  const struct usbnet_mii *unm)	/* additional mii_attach flags */
+{
 	USBNETHIST_FUNC(); USBNETHIST_CALLED();
 	struct usbnet_private * const unp = un->un_pri;
 	struct ifnet * const ifp = usbnet_ifp(un);
 	KASSERT(unp->unp_attached);
 	KASSERT(!unp->unp_ifp_attached);
 	ifp->if_softc = un;
 	strlcpy(ifp->if_xname, device_xname(un->un_dev), IFNAMSIZ);
 	ifp->if_flags = if_flags;
 	ifp->if_extflags = IFEF_MPSAFE | if_extflags;
 	ifp->if_ioctl = usbnet_if_ioctl;
 	ifp->if_start = usbnet_if_start;
 	ifp->if_init = usbnet_if_init;
 	ifp->if_stop = usbnet_if_stop;
 	if (unm)
 		usbnet_attach_mii(un, unm);
 	else
 		unp->unp_link = true;
 	/* Attach the interface. */
 	if_initialize(ifp);
 	if (ifp->_if_input == NULL)
 		ifp->if_percpuq = if_percpuq_create(ifp);
 	if_register(ifp);
 	unp->unp_ifp_attached = true;
 	/*
 	 * If ethernet address is all zero, skip ether_ifattach() and
 	 * instead attach bpf here..
 	 */
 	if (!usbnet_empty_eaddr(un)) {
 		ether_set_ifflags_cb(&unp->unp_ec, usbnet_ifflags_cb);
 		aprint_normal_dev(un->un_dev, "Ethernet address %s\n",
 		    ether_sprintf(un->un_eaddr));
 		ether_ifattach(ifp, un->un_eaddr);
 	} else {
 		if_alloc_sadl(ifp);
 		bpf_attach(ifp, DLT_RAW, 0);
+	}
 	/* Now ready, and attached. */
 	IFQ_SET_READY(&ifp->if_snd);
 	ifp->if_softc = un;
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, un->un_udev, un->un_dev);
 	if (!pmf_device_register(un->un_dev, NULL, NULL))
 		aprint_error_dev(un->un_dev, "couldn't establish power handler\n");
+}
 int
 usbnet_detach(device_t self, int flags)
+{
 	USBNETHIST_FUNC(); USBNETHIST_CALLED();
 	struct usbnet * const un = device_private(self);
 	struct usbnet_private * const unp = un->un_pri;
 @@ -1574,27 +1577,27 @@ usbnet_detach(device_t self, int flags)
+	}
 	mutex_exit(&unp->unp_core_lock);
 	usbnet_rx_list_free(un);
 	usbnet_tx_list_free(un);
 	callout_destroy(&unp->unp_stat_ch);
 	rnd_detach_source(&unp->unp_rndsrc);
 	if (mii) {
 		mii_detach(mii, MII_PHY_ANY, MII_OFFSET_ANY);
 		ifmedia_fini(&mii->mii_media);
+	}
-	if (ifp->if_softc) {
+	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