 @@ -1,14 +1,14 @@
-/*	$NetBSD: if.c,v 1.394.2.16 2019/04/19 09:12:58 martin Exp $	*/
+/*	$NetBSD: if.c,v 1.394.2.17 2019/08/19 14:27:16 martin Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by William Studenmund and Jason R. Thorpe.
+ *
  * 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.
 @@ -80,27 +80,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, 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.
+ *
  *	@(#)if.c	8.5 (Berkeley) 1/9/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.394.2.16 2019/04/19 09:12:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.394.2.17 2019/08/19 14:27:16 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_atalk.h"
 #include "opt_natm.h"
 #include "opt_wlan.h"
 #include "opt_net_mpsafe.h"
 #include "opt_mrouting.h"
 #endif
 #include <sys/param.h>
 #include <sys/mbuf.h>
 @@ -1591,52 +1591,64 @@ if_clone_create(const char *name)
 	return (*ifc->ifc_create)(ifc, unit);
+}
 /*
  * Destroy a clone network interface.
  */
 static int
 if_clone_destroy(const char *name)
+{
 	struct if_clone *ifc;
 	struct ifnet *ifp;
 	struct psref psref;
 	int error;
 	int (*if_ioctl)(struct ifnet *, u_long, void *);
 	KASSERT(mutex_owned(&if_clone_mtx));
 	ifc = if_clone_lookup(name, NULL);
 	if (ifc == NULL)
 		return EINVAL;
 	if (ifc->ifc_destroy == NULL)
 		return EOPNOTSUPP;
 	ifp = if_get(name, &psref);
 	if (ifp == NULL)
 		return ENXIO;
 	/* We have to disable ioctls here */
 	IFNET_LOCK(ifp);
 	if_ioctl = ifp->if_ioctl;
 	ifp->if_ioctl = if_nullioctl;
 	IFNET_UNLOCK(ifp);
 	/*
 	 * We cannot call ifc_destroy with holding ifp.
 	 * Releasing ifp here is safe thanks to if_clone_mtx.
 	 */
 	if_put(ifp, &psref);
-	return (*ifc->ifc_destroy)(ifp);
+	error = (*ifc->ifc_destroy)(ifp);
 	if (error != 0) {
 		/* We have to restore if_ioctl on error */
 		IFNET_LOCK(ifp);
 		ifp->if_ioctl = if_ioctl;
 		IFNET_UNLOCK(ifp);
+	}
 	return error;
+}
 static bool
 if_is_unit(const char *name)
+{
 	while(*name != '\0') {
 		if (*name < '0' || *name > '9')
 			return false;
 		name++;
+	}
 	return true;

 @@ -1,14 +1,14 @@
-# $NetBSD: t_ifconfig.sh,v 1.18 2017/03/16 09:43:56 ozaki-r Exp $
+# $NetBSD: t_ifconfig.sh,v 1.18.4.1 2019/08/19 14:27:16 martin Exp $
+#
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # 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.
+#
 @@ -59,26 +59,31 @@ ifconfig_create_destroy_body()
 	atf_check -s exit:0 rump.ifconfig shmif0 create
 	atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
 	atf_check -s exit:0 rump.ifconfig shmif0 192.168.0.1/24
 	atf_check -s exit:0 rump.ifconfig shmif0 up
 	atf_check -s exit:0 rump.ifconfig shmif0 destroy
 	# Create and destroy (with an IPv6 address)
 	atf_check -s exit:0 rump.ifconfig shmif0 create
 	atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
 	atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::1
 	atf_check -s exit:0 rump.ifconfig shmif0 up
 	atf_check -s exit:0 rump.ifconfig shmif0 destroy
 	# Check if ifconfig (ioctl) works after a failure of ifconfig destroy
 	atf_check -s exit:0 -o ignore rump.ifconfig lo0
 	atf_check -s not-exit:0 -e ignore rump.ifconfig lo0 destroy
 	atf_check -s exit:0 -o ignore rump.ifconfig lo0
 	unset RUMP_SERVER
+}
 ifconfig_create_destroy_cleanup()
+{
 	RUMP_SERVER=${RUMP_SERVER1} rump.halt
+}
 atf_test_case ifconfig_options cleanup
 ifconfig_options_head()
+{