 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_tap.c,v 1.129 2024/04/17 18:32:13 riastradh Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.130 2024/04/17 18:52:25 riastradh Exp $	*/
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
  *  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.
 @@ -23,27 +23,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.
  */
 /*
  * tap(4) is a virtual Ethernet interface.  It appears as a real Ethernet
  * device to the system, but can also be accessed by userland through a
  * character device interface, which allows reading and injecting frames.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.129 2024/04/17 18:32:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.130 2024/04/17 18:52:25 riastradh Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_modular.h"
 #endif
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/conf.h>
 #include <sys/cprng.h>
 #include <sys/device.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 @@ -200,27 +200,27 @@ static void	tap_softintr(void *);
  * an Ethernet device.
+ *
  * Here are the bits needed for a clonable interface.
  */
 static int	tap_clone_create(struct if_clone *, int);
 static int	tap_clone_destroy(struct ifnet *);
 struct if_clone tap_cloners = IF_CLONE_INITIALIZER("tap",
 					tap_clone_create,
 					tap_clone_destroy);
 /* Helper functions shared by the two cloning code paths */
 static struct tap_softc *	tap_clone_creator(int);
-int	tap_clone_destroyer(device_t);
+static void			tap_clone_destroyer(device_t);
 static struct sysctllog *tap_sysctl_clog;
 #ifdef _MODULE
 devmajor_t tap_bmajor = -1, tap_cmajor = -1;
 #endif
 static u_int tap_count;
 void
 tapattach(int n)
+{
 @@ -615,53 +615,45 @@ tap_clone_creator(int unit)
 	cf->cf_atname = tap_ca.ca_name;
 	if (unit == -1) {
 		/* let autoconf find the first free one */
 		cf->cf_unit = 0;
 		cf->cf_fstate = FSTATE_STAR;
 	} else {
 		cf->cf_unit = unit;
 		cf->cf_fstate = FSTATE_NOTFOUND;
+	}
 	return device_private(config_attach_pseudo(cf));
+}
 /*
  * The clean design of if_clone and autoconf(9) makes that part
  * really straightforward.  The second argument of config_detach
  * means neither QUIET nor FORCED.
  */
 static int
 tap_clone_destroy(struct ifnet *ifp)
+{
 	struct tap_softc *sc = ifp->if_softc;
 	int error = tap_clone_destroyer(sc->sc_dev);
-	if (error == 0)
+	tap_clone_destroyer(sc->sc_dev);
-		atomic_dec_uint(&tap_count);
+	atomic_dec_uint(&tap_count);
-	return error;
+	return 0;
+}
-int
+static void
 tap_clone_destroyer(device_t dev)
+{
 	cfdata_t cf = device_cfdata(dev);
 	int error;
-	if ((error = config_detach(dev, 0)) != 0)
+	error = config_detach(dev, 0);
-		aprint_error_dev(dev, "unable to detach instance\n");
+	KASSERTMSG(error == 0, "error=%d", error);
 	kmem_free(cf, sizeof(*cf));
 	return error;
+}
 /*
  * tap(4) is a bit of an hybrid device.  It can be used in two different
  * ways:
  *  1. ifconfig tapN create, then use /dev/tapN to read/write off it.
  *  2. open /dev/tap, get a new interface created and read/write off it.
  *     That interface is destroyed when the process that had it created exits.
+ *
  * The first way is managed by the cdevsw structure, and you access interfaces
  * through a (major, minor) mapping:  tap4 is obtained by the minor number
  * 4.  The entry points for the cdevsw interface are prefixed by tap_cdev_.
+ *
 @@ -764,45 +756,44 @@ tap_cdev_close(dev_t dev, int flags, int
+}
 /*
  * It might happen that the administrator used ifconfig to externally destroy
  * the interface.  In that case, tap_fops_close will be called while
  * tap_detach is already happening.  If we called it again from here, we
  * would dead lock.  TAP_GOING ensures that this situation doesn't happen.
  */
 static int
 tap_fops_close(file_t *fp)
+{
 	struct tap_softc *sc;
 	int unit = fp->f_devunit;
 	int error;
 	sc = device_lookup_private(&tap_cd, unit);
 	if (sc == NULL)
 		return ENXIO;
 	KERNEL_LOCK(1, NULL);
 	tap_dev_close(sc);
-	/* Destroy the device now that it is no longer useful,
+	/*
-	 * unless it's already being destroyed. */
+	 * Destroy the device now that it is no longer useful, unless
-	if ((sc->sc_flags & TAP_GOING) != 0) {
+	 * it's already being destroyed.
-		KERNEL_UNLOCK_ONE(NULL);
+	 */
-		return 0;
+	if ((sc->sc_flags & TAP_GOING) != 0)
 		goto out;
 	tap_clone_destroyer(sc->sc_dev);
-	error = tap_clone_destroyer(sc->sc_dev);
+out:	KERNEL_UNLOCK_ONE(NULL);
-	KERNEL_UNLOCK_ONE(NULL);
+	return 0;
 	return error;
+}
 static void
 tap_dev_close(struct tap_softc *sc)
+{
 	struct ifnet *ifp;
 	int s;
 	s = splnet();
 	/* Let tap_start handle packets again */
 	ifp = &sc->sc_ec.ec_if;
 	ifp->if_flags &= ~IFF_OACTIVE;