 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_tap.c,v 1.128 2023/01/06 01:54:22 ozaki-r Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.129 2024/04/17 18:32:13 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.128 2023/01/06 01:54:22 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.129 2024/04/17 18:32:13 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>
 @@ -107,27 +107,27 @@ struct tap_softc {
 };
 /* autoconf(9) glue */
 static int	tap_match(device_t, cfdata_t, void *);
 static void	tap_attach(device_t, device_t, void *);
 static int	tap_detach(device_t, int);
 CFATTACH_DECL_NEW(tap, sizeof(struct tap_softc),
     tap_match, tap_attach, tap_detach, NULL);
 extern struct cfdriver tap_cd;
 /* Real device access routines */
-static int	tap_dev_close(struct tap_softc *);
+static void	tap_dev_close(struct tap_softc *);
 static int	tap_dev_read(int, struct uio *, int);
 static int	tap_dev_write(int, struct uio *, int);
 static int	tap_dev_ioctl(int, u_long, void *, struct lwp *);
 static int	tap_dev_poll(int, int, struct lwp *);
 static int	tap_dev_kqfilter(int, struct knote *);
 /* Fileops access routines */
 static int	tap_fops_close(file_t *);
 static int	tap_fops_read(file_t *, off_t *, struct uio *,
     kauth_cred_t, int);
 static int	tap_fops_write(file_t *, off_t *, struct uio *,
     kauth_cred_t, int);
 static int	tap_fops_ioctl(file_t *, u_long, void *);
 @@ -749,67 +749,63 @@ tap_dev_cloner(struct lwp *l)
  * As for the other, the core of it is shared in tap_dev_close.  What
  * it does is sufficient for the cdevsw interface, but the cloning interface
  * needs another thing:  the interface is destroyed when the processes that
  * created it closes it.
  */
 static int
 tap_cdev_close(dev_t dev, int flags, int fmt, struct lwp *l)
+{
 	struct tap_softc *sc = device_lookup_private(&tap_cd, minor(dev));
 	if (sc == NULL)
 		return ENXIO;
-	return tap_dev_close(sc);
+	tap_dev_close(sc);
 	return 0;
+}
 /*
  * 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;
 	/* tap_dev_close currently always succeeds, but it might not
 	 * always be the case. */
 	KERNEL_LOCK(1, NULL);
-	if ((error = tap_dev_close(sc)) != 0) {
+	tap_dev_close(sc);
 		KERNEL_UNLOCK_ONE(NULL);
 		return error;
 	/* Destroy the device now that it is no longer useful,
 	 * unless it's already being destroyed. */
 	if ((sc->sc_flags & TAP_GOING) != 0) {
 		KERNEL_UNLOCK_ONE(NULL);
 		return 0;
+	}
 	error = tap_clone_destroyer(sc->sc_dev);
 	KERNEL_UNLOCK_ONE(NULL);
 	return error;
+}
-static int
+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;
 	/* Purge output queue */
 	if (!(IFQ_IS_EMPTY(&ifp->if_snd))) {
 		struct mbuf *m;
 @@ -822,28 +818,26 @@ tap_dev_close(struct tap_softc *sc)
 			if_statadd2(ifp, if_opackets, 1, if_obytes, m->m_len);
 			bpf_mtap(ifp, m, BPF_D_OUT);
 			m_freem(m);
+		}
+	}
 	splx(s);
 	if (sc->sc_sih != NULL) {
 		softint_disestablish(sc->sc_sih);
 		sc->sc_sih = NULL;
+	}
 	sc->sc_flags &= ~(TAP_INUSE | TAP_ASYNCIO);
 	if_link_state_change(ifp, LINK_STATE_DOWN);
 	return 0;
+}
 static int
 tap_cdev_read(dev_t dev, struct uio *uio, int flags)
+{
 	return tap_dev_read(minor(dev), uio, flags);
+}
 static int
 tap_fops_read(file_t *fp, off_t *offp, struct uio *uio,
     kauth_cred_t cred, int flags)
+{