Thu Mar 3 05:55:10 2022 UTC ()

usbnet: Do nothing on if_init/stop if already in the target state.

The network stack _shouldn't_ ever call us if so, but I'm not yet
sure it _won't_.


(riastradh)

diff -r1.84 -r1.85 src/sys/dev/usb/usbnet.c

--- src/sys/dev/usb/usbnet.c 2022/03/03 05:54:52	1.84
+++ src/sys/dev/usb/usbnet.c 2022/03/03 05:55:10	1.85

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbnet.c,v 1.84 2022/03/03 05:54:52 riastradh Exp $	*/
+/*	$NetBSD: usbnet.c,v 1.85 2022/03/03 05:55:10 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.84 2022/03/03 05:54:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.85 2022/03/03 05:55:10 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;
 @@ -1152,26 +1152,36 @@ usbnet_stop(struct usbnet *un, struct if
 	KASSERTMSG(!unp->unp_ifp_attached || IFNET_LOCKED(ifp),
 	    "%s", ifp->if_xname);
 	ifp->if_flags &= ~IFF_RUNNING;
+}
 static void
 usbnet_if_stop(struct ifnet *ifp, int disable)
+{
 	struct usbnet * const un = ifp->if_softc;
 	struct usbnet_private * const unp = un->un_pri;
 	KASSERTMSG(IFNET_LOCKED(ifp), "%s", ifp->if_xname);
 	/*
 	 * If we're already stopped, nothing to do.
+	 *
 	 * XXX This should be an assertion, but it may require some
 	 * analysis -- and possibly some tweaking -- of sys/net to
 	 * ensure.
 	 */
 	if ((ifp->if_flags & IFF_RUNNING) == 0)
 		return;
 	mutex_enter(&unp->unp_core_lock);
 	usbnet_stop(un, ifp, disable);
 	mutex_exit(&unp->unp_core_lock);
+}
 /*
  * Generic tick task function.
+ *
  * usbnet_tick() is triggered from a callout, and triggers a call to
  * usbnet_tick_task() from the usb_task subsystem.
  */
 static void
 usbnet_tick(void *arg)
 @@ -1253,26 +1263,36 @@ usbnet_if_init(struct ifnet *ifp)
 	USBNETHIST_FUNC(); USBNETHIST_CALLED();
 	struct usbnet * const un = ifp->if_softc;
 	int error;
 	KASSERTMSG(IFNET_LOCKED(ifp), "%s", ifp->if_xname);
 	/*
 	 * Prevent anyone from bringing the interface back up once
 	 * we're detaching.
 	 */
 	if (usbnet_isdying(un))
 		return EIO;
 	/*
 	 * If we're already running, nothing to do.
+	 *
 	 * XXX This should be an assertion, but it may require some
 	 * analysis -- and possibly some tweaking -- of sys/net to
 	 * ensure.
 	 */
 	if (ifp->if_flags & IFF_RUNNING)
 		return 0;
 	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
 usbnet_set_link(struct usbnet *un, bool link)
+{