Tue Jan 2 10:20:34 2018 UTC ()

Pull up following revision(s) (requested by ozaki-r in ticket #456):
	sys/arch/arm/sunxi/sunxi_emac.c: 1.9
	sys/dev/ic/dwc_gmac.c: 1.43-1.44
	sys/dev/pci/if_iwm.c: 1.75
	sys/dev/pci/if_wm.c: 1.543
	sys/dev/pci/ixgbe/ixgbe.c: 1.112
	sys/dev/pci/ixgbe/ixv.c: 1.74
	sys/kern/sys_socket.c: 1.75
	sys/net/agr/if_agr.c: 1.43
	sys/net/bpf.c: 1.219
	sys/net/if.c: 1.397, 1.399, 1.401-1.403, 1.406-1.410, 1.412-1.416
	sys/net/if.h: 1.242-1.247, 1.250, 1.252-1.257
	sys/net/if_bridge.c: 1.140 via patch, 1.142-1.146
	sys/net/if_etherip.c: 1.40
	sys/net/if_ethersubr.c: 1.243, 1.246
	sys/net/if_faith.c: 1.57
	sys/net/if_gif.c: 1.132
	sys/net/if_l2tp.c: 1.15, 1.17
	sys/net/if_loop.c: 1.98-1.101
	sys/net/if_media.c: 1.35
	sys/net/if_pppoe.c: 1.131-1.132
	sys/net/if_spppsubr.c: 1.176-1.177
	sys/net/if_tun.c: 1.142
	sys/net/if_vlan.c: 1.107, 1.109, 1.114-1.121
	sys/net/npf/npf_ifaddr.c: 1.3
	sys/net/npf/npf_os.c: 1.8-1.9
	sys/net/rtsock.c: 1.230
	sys/netcan/if_canloop.c: 1.3-1.5
	sys/netinet/if_arp.c: 1.255
	sys/netinet/igmp.c: 1.65
	sys/netinet/in.c: 1.210-1.211
	sys/netinet/in_pcb.c: 1.180
	sys/netinet/ip_carp.c: 1.92, 1.94
	sys/netinet/ip_flow.c: 1.81
	sys/netinet/ip_input.c: 1.362
	sys/netinet/ip_mroute.c: 1.147
	sys/netinet/ip_output.c: 1.283, 1.285, 1.287
	sys/netinet6/frag6.c: 1.61
	sys/netinet6/in6.c: 1.251, 1.255
	sys/netinet6/in6_pcb.c: 1.162
	sys/netinet6/ip6_flow.c: 1.35
	sys/netinet6/ip6_input.c: 1.183
	sys/netinet6/ip6_output.c: 1.196
	sys/netinet6/mld6.c: 1.90
	sys/netinet6/nd6.c: 1.239-1.240
	sys/netinet6/nd6_nbr.c: 1.139
	sys/netinet6/nd6_rtr.c: 1.136
	sys/netipsec/ipsec_output.c: 1.65
	sys/rump/net/lib/libnetinet/netinet_component.c: 1.9-1.10
kmem_intr_free kmem_intr_[z]alloced memory
the underlying pools are the same but api-wise those should match
Unify IFEF_*_MPSAFE into IFEF_MPSAFE
There are already two flags for if_output and if_start, however, it seems such
MPSAFE flags are eventually needed for all if_XXX operations. Having discrete
flags for each operation is wasteful of if_extflags bits. So let's unify
the flags into one: IFEF_MPSAFE.
Fortunately IFEF_*_MPSAFE flags have never been included in any releases, so
we can change them without breaking backward compatibility of the releases
(though the kernel version of -current should be bumped).
Note that if an interface have both MP-safe and non-MP-safe operations at a
time, we have to set the IFEF_MPSAFE flag and let callees of non-MP-safe
opeartions take the kernel lock.
Proposed on tech-kern@ and tech-net@
Provide macros for softnet_lock and KERNEL_LOCK hiding NET_MPSAFE switch
It reduces C&P codes such as "#ifndef NET_MPSAFE KERNEL_LOCK(1, NULL); ..."
scattered all over the source code and makes it easy to identify remaining
KERNEL_LOCK and/or softnet_lock that are held even if NET_MPSAFE.
No functional change
Hold KERNEL_LOCK on if_ioctl selectively based on IFEF_MPSAFE
If IFEF_MPSAFE is set, hold the lock and otherwise don't hold.
This change requires additions of KERNEL_LOCK to subsequence functions from
if_ioctl such as ifmedia_ioctl and ifioctl_common to protect non-MP-safe
components.
Proposed on tech-kern@ and tech-net@
Ensure to hold if_ioctl_lock when calling if_flags_set
Fix locking against myself on ifpromisc
vlan_unconfig_locked could be called with holding if_ioctl_lock.
Ensure to not turn on IFF_RUNNING of an interface until its initialization completes
And ensure to turn off it before destruction as per IFF_RUNNING's description
"resource allocated". (The description is a bit doubtful though, I believe the
change is still proper.)
Ensure to hold if_ioctl_lock on if_up and if_down
One exception for if_down is if_detach; in the case the lock isn't needed
because it's guaranteed that no other one can access ifp at that point.
Make if_link_queue MP-safe if IFEF_MPSAFE
if_link_queue is a queue to store events of link state changes, which is
used to pass events from (typically) an interrupt handler to
if_link_state_change softint. The queue was protected by KERNEL_LOCK so far,
but if IFEF_MPSAFE is enabled, it becomes unsafe because (perhaps) an interrupt
handler of an interface with IFEF_MPSAFE doesn't take KERNEL_LOCK. Protect it
by a spin mutex.
Additionally with this change KERNEL_LOCK of if_link_state_change softint is
omitted if NET_MPSAFE is enabled.
Note that the spin mutex is now ifp->if_snd.ifq_lock as well as the case of
if_timer (see the comment).
Use IFADDR_WRITER_FOREACH instead of IFADDR_READER_FOREACH
At that point no other one modifies the list so IFADDR_READER_FOREACH
is unnecessary. Use of IFADDR_READER_FOREACH is harmless in general though,
if we try to detect contract violations of pserialize, using it violates
the contract. So avoid using it makes life easy.
Ensure to call if_addr_init with holding if_ioctl_lock
Get rid of outdated comments
Fix build of kernels without ether
By throwing out if_enable_vlan_mtu and if_disable_vlan_mtu that
created a unnecessary dependency from if.c to if_ethersubr.c.
PR kern/52790
Rename IFNET_LOCK to IFNET_GLOBAL_LOCK
IFNET_LOCK will be used in another lock, if_ioctl_lock (might be renamed then).
Wrap if_ioctl_lock with IFNET_* macros (NFC)
Also if_ioctl_lock perhaps needs to be renamed to something because it's now
not just for ioctl...
Reorder some destruction routines in if_detach
- Destroy if_ioctl_lock at the end of the if_detach because it's used in various
  destruction routines
- Move psref_target_destroy after pr_purgeif because we want to use psref in
  pr_purgeif (otherwise destruction procedures can be tricky)
Ensure to call if_mcast_op with holding IFNET_LOCK
Note that CARP doesn't deal with IFNET_LOCK yet.
Remove IFNET_GLOBAL_LOCK where it's unnecessary because IFNET_LOCK is held
Describe which lock is used to protect each member variable of struct ifnet
Requested by skrll@
Write a guideline for converting an interface to IFEF_MPSAFE
Requested by skrll@
Note that IFNET_LOCK must not be held in softint
Don't set IFEF_MPSAFE unless NET_MPSAFE at this point
Because recent investigations show that interfaces with IFEF_MPSAFE need to
follow additional restrictions to work with the flag safely. We should enable it
on an interface by default only if the interface surely satisfies the
restrictions, which are described in if.h.
Note that enabling IFEF_MPSAFE solely gains a few benefit on performance because
the network stack is still serialized by the big kernel locks by default.


(snj)

diff -r1.4.4.3 -r1.4.4.4 src/sys/arch/arm/sunxi/sunxi_emac.c
diff -r1.40.6.1 -r1.40.6.2 src/sys/dev/ic/dwc_gmac.c
diff -r1.73.2.2 -r1.73.2.3 src/sys/dev/pci/if_iwm.c
diff -r1.508.4.10 -r1.508.4.11 src/sys/dev/pci/if_wm.c
diff -r1.88.2.6 -r1.88.2.7 src/sys/dev/pci/ixgbe/ixgbe.c
diff -r1.56.2.3 -r1.56.2.4 src/sys/dev/pci/ixgbe/ixv.c
diff -r1.74 -r1.74.10.1 src/sys/kern/sys_socket.c
diff -r1.216.6.3 -r1.216.6.4 src/sys/net/bpf.c
diff -r1.394.2.3 -r1.394.2.4 src/sys/net/if.c
diff -r1.239.2.2 -r1.239.2.3 src/sys/net/if.h
diff -r1.134.6.4 -r1.134.6.5 src/sys/net/if_bridge.c
diff -r1.38.10.1 -r1.38.10.2 src/sys/net/if_etherip.c
diff -r1.242.6.1 -r1.242.6.2 src/sys/net/if_ethersubr.c
diff -r1.55.8.1 -r1.55.8.2 src/sys/net/if_faith.c
diff -r1.126.2.5 -r1.126.2.6 src/sys/net/if_gif.c
diff -r1.11.2.2 -r1.11.2.3 src/sys/net/if_l2tp.c
diff -r1.94.6.3 -r1.94.6.4 src/sys/net/if_loop.c
diff -r1.32.6.1 -r1.32.6.2 src/sys/net/if_media.c
diff -r1.125.6.4 -r1.125.6.5 src/sys/net/if_pppoe.c
diff -r1.169.6.2 -r1.169.6.3 src/sys/net/if_spppsubr.c
diff -r1.139.2.1 -r1.139.2.2 src/sys/net/if_tun.c
diff -r1.97.2.10 -r1.97.2.11 src/sys/net/if_vlan.c
diff -r1.213.2.3 -r1.213.2.4 src/sys/net/rtsock.c
diff -r1.41 -r1.41.6.1 src/sys/net/agr/if_agr.c
diff -r1.2 -r1.2.12.1 src/sys/net/npf/npf_ifaddr.c
diff -r1.6.8.1 -r1.6.8.2 src/sys/net/npf/npf_os.c
diff -r1.2 -r1.2.2.1 src/sys/netcan/if_canloop.c
diff -r1.250.2.3 -r1.250.2.4 src/sys/netinet/if_arp.c
diff -r1.64 -r1.64.6.1 src/sys/netinet/igmp.c
diff -r1.203.2.3 -r1.203.2.4 src/sys/netinet/in.c
diff -r1.178.4.1 -r1.178.4.2 src/sys/netinet/in_pcb.c
diff -r1.90.2.2 -r1.90.2.3 src/sys/netinet/ip_carp.c
diff -r1.80 -r1.80.6.1 src/sys/netinet/ip_flow.c
diff -r1.355.2.2 -r1.355.2.3 src/sys/netinet/ip_input.c
diff -r1.146.6.1 -r1.146.6.2 src/sys/netinet/ip_mroute.c
diff -r1.279.2.2 -r1.279.2.3 src/sys/netinet/ip_output.c
diff -r1.60 -r1.60.6.1 src/sys/netinet6/frag6.c
diff -r1.245.2.3 -r1.245.2.4 src/sys/netinet6/in6.c
diff -r1.161 -r1.161.4.1 src/sys/netinet6/in6_pcb.c
diff -r1.34 -r1.34.8.1 src/sys/netinet6/ip6_flow.c
diff -r1.178.2.2 -r1.178.2.3 src/sys/netinet6/ip6_input.c
diff -r1.191.6.3 -r1.191.6.4 src/sys/netinet6/ip6_output.c
diff -r1.89 -r1.89.2.1 src/sys/netinet6/mld6.c
diff -r1.232.2.4 -r1.232.2.5 src/sys/netinet6/nd6.c
diff -r1.138 -r1.138.6.1 src/sys/netinet6/nd6_nbr.c
diff -r1.135 -r1.135.6.1 src/sys/netinet6/nd6_rtr.c
diff -r1.48.2.1 -r1.48.2.2 src/sys/netipsec/ipsec_output.c
diff -r1.8 -r1.8.6.1 src/sys/rump/net/lib/libnetinet/netinet_component.c

--- src/sys/arch/arm/sunxi/sunxi_emac.c 2017/09/11 05:24:16	1.4.4.3
+++ src/sys/arch/arm/sunxi/sunxi_emac.c 2018/01/02 10:20:32	1.4.4.4

 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_emac.c,v 1.4.4.3 2017/09/11 05:24:16 snj Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.4.4.4 2018/01/02 10:20:32 snj Exp $ */
 /*-
  * Copyright (c) 2016-2017 Jared McNeill <jmcneill@invisible.ca>
  * 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 @@
  * 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.
  */
 /*
  * Allwinner Gigabit Ethernet MAC (EMAC) controller
  */
 #include "opt_net_mpsafe.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.4.4.3 2017/09/11 05:24:16 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.4.4.4 2018/01/02 10:20:32 snj Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/callout.h>
 #include <sys/gpio.h>
 #include <sys/cprng.h>
 #include <net/if.h>
 @@ -1358,27 +1358,27 @@ sunxi_emac_attach(device_t parent, devic
 	    FDT_INTR_FLAGS, sunxi_emac_intr, sc);
 	if (sc->ih == NULL) {
 		aprint_error_dev(self, "failed to establish interrupt on %s\n",
 		    intrstr);
 		return;
+	}
 	aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 	/* Setup ethernet interface */
 	ifp->if_softc = sc;
 	snprintf(ifp->if_xname, IFNAMSIZ, EMAC_IFNAME, device_unit(self));
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 #ifdef EMAC_MPSAFE
-	ifp->if_extflags = IFEF_START_MPSAFE;
+	ifp->if_extflags = IFEF_MPSAFE;
 #endif
 	ifp->if_start = sunxi_emac_start;
 	ifp->if_ioctl = sunxi_emac_ioctl;
 	ifp->if_init = sunxi_emac_init;
 	ifp->if_stop = sunxi_emac_stop;
 	ifp->if_capabilities = IFCAP_CSUM_IPv4_Rx |
 			       IFCAP_CSUM_IPv4_Tx |
 			       IFCAP_CSUM_TCPv4_Rx |
 			       IFCAP_CSUM_TCPv4_Tx |
 			       IFCAP_CSUM_UDPv4_Rx |
 			       IFCAP_CSUM_UDPv4_Tx;
 	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);

--- src/sys/dev/ic/dwc_gmac.c 2017/12/10 10:10:23	1.40.6.1
+++ src/sys/dev/ic/dwc_gmac.c 2018/01/02 10:20:32	1.40.6.2

 @@ -1,14 +1,14 @@
-/* $NetBSD: dwc_gmac.c,v 1.40.6.1 2017/12/10 10:10:23 snj Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.40.6.2 2018/01/02 10:20:32 snj Exp $ */
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry and Martin Husemann.
+ *
  * 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.
 @@ -31,27 +31,27 @@
 /*
  * This driver supports the Synopsis Designware GMAC core, as found
  * on Allwinner A20 cores and others.
+ *
  * Real documentation seems to not be available, the marketing product
  * documents could be found here:
+ *
  *  http://www.synopsys.com/dw/ipdir.php?ds=dwc_ether_mac10_100_1000_unive
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.40.6.1 2017/12/10 10:10:23 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.40.6.2 2018/01/02 10:20:32 snj Exp $");
 /* #define	DWC_GMAC_DEBUG	1 */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 @@ -213,27 +213,29 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
 		goto fail;
+	}
 	sc->sc_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NET);
 	mutex_init(&sc->sc_txq.t_mtx, MUTEX_DEFAULT, IPL_NET);
 	mutex_init(&sc->sc_rxq.r_mtx, MUTEX_DEFAULT, IPL_NET);
 	/*
 	 * Prepare interface data
 	 */
 	ifp->if_softc = sc;
 	strlcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	ifp->if_extflags = IFEF_START_MPSAFE;
+#ifdef DWCGMAC_MPSAFE
 	ifp->if_extflags = IFEF_MPSAFE;
 #endif
 	ifp->if_ioctl = dwc_gmac_ioctl;
 	ifp->if_start = dwc_gmac_start;
 	ifp->if_init = dwc_gmac_init;
 	ifp->if_stop = dwc_gmac_stop;
 	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);
 	/*
 	 * Attach MII subdevices
 	 */
 	sc->sc_ec.ec_mii = &sc->sc_mii;
 	ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus);
         mii->mii_ifp = ifp;
 @@ -826,27 +828,27 @@ dwc_gmac_init_locked(struct ifnet *ifp)
 	sc->sc_stopping = false;
 	ifp->if_flags |= IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	return 0;
+}
 static void
 dwc_gmac_start(struct ifnet *ifp)
+{
 	struct dwc_gmac_softc *sc = ifp->if_softc;
-	KASSERT(ifp->if_extflags & IFEF_START_MPSAFE);
+	KASSERT(if_is_mpsafe(ifp));
 	mutex_enter(sc->sc_lock);
 	if (!sc->sc_stopping) {
 		mutex_enter(&sc->sc_txq.t_mtx);
 		dwc_gmac_start_locked(ifp);
 		mutex_exit(&sc->sc_txq.t_mtx);
+	}
 	mutex_exit(sc->sc_lock);
+}
 static void
 dwc_gmac_start_locked(struct ifnet *ifp)
+{

--- src/sys/dev/pci/if_iwm.c 2017/12/10 10:10:24	1.73.2.2
+++ src/sys/dev/pci/if_iwm.c 2018/01/02 10:20:33	1.73.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_iwm.c,v 1.73.2.2 2017/12/10 10:10:24 snj Exp $	*/
+/*	$NetBSD: if_iwm.c,v 1.73.2.3 2018/01/02 10:20:33 snj Exp $	*/
 /*	OpenBSD: if_iwm.c,v 1.148 2016/11/19 21:07:08 stsp Exp	*/
 #define IEEE80211_NO_HT
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
  *   Author: Stefan Sperling <stsp@openbsd.org>
  * Copyright (c) 2014 Fixup Software Ltd.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 @@ -96,27 +96,27 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.73.2.2 2017/12/10 10:10:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.73.2.3 2018/01/02 10:20:33 snj Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 @@ -6311,27 +6311,27 @@ iwm_do_newstate(struct ieee80211com *ic,
+}
 static void
 iwm_newstate_cb(struct work *wk, void *v)
+{
 	struct iwm_softc *sc = v;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct iwm_newstate_state *iwmns = (struct iwm_newstate_state *)wk;
 	enum ieee80211_state nstate = iwmns->ns_nstate;
 	int generation = iwmns->ns_generation;
 	int arg = iwmns->ns_arg;
 	int s;
-	kmem_free(iwmns, sizeof(*iwmns));
+	kmem_intr_free(iwmns, sizeof(*iwmns));
 	s = splnet();
 	DPRINTF(("Prepare to switch state %d->%d\n", ic->ic_state, nstate));
 	if (sc->sc_generation != generation) {
 		DPRINTF(("newstate_cb: someone pulled the plug meanwhile\n"));
 		if (nstate == IEEE80211_S_INIT) {
 			DPRINTF(("newstate_cb: nstate == IEEE80211_S_INIT: "
 			    "calling sc_newstate()\n"));
 			(void) sc->sc_newstate(ic, nstate, arg);
+		}
 	} else
 		(void) iwm_do_newstate(ic, nstate, arg);

--- src/sys/dev/pci/if_wm.c 2017/12/10 10:16:09	1.508.4.10
+++ src/sys/dev/pci/if_wm.c 2018/01/02 10:20:33	1.508.4.11

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.508.4.10 2017/12/10 10:16:09 snj Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.508.4.11 2018/01/02 10:20:33 snj Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -73,27 +73,27 @@
  * TODO (in order of importance):
+ *
  *	- Check XXX'ed comments
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Split header buffer for newer descriptors
  *	- EEE (Energy Efficiency Ethernet)
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  *	- Image Unique ID
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.10 2017/12/10 10:16:09 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.11 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #include "opt_if_wm.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 @@ -2626,27 +2626,27 @@ alloc_retry:
 	/* Initialize the media structures accordingly. */
 	if (sc->sc_mediatype == WM_MEDIATYPE_COPPER)
 		wm_gmii_mediainit(sc, wmp->wmp_product);
 	else
 		wm_tbi_mediainit(sc); /* All others */
 	ifp = &sc->sc_ethercom.ec_if;
 	xname = device_xname(sc->sc_dev);
 	strlcpy(ifp->if_xname, xname, IFNAMSIZ);
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 #ifdef WM_MPSAFE
-	ifp->if_extflags = IFEF_START_MPSAFE;
+	ifp->if_extflags = IFEF_MPSAFE;
 #endif
 	ifp->if_ioctl = wm_ioctl;
 	if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) {
 		ifp->if_start = wm_nq_start;
 		/*
 		 * When the number of CPUs is one and the controller can use
 		 * MSI-X, wm(4) use MSI-X but *does not* use multiqueue.
 		 * That is, wm(4) use two interrupts, one is used for Tx/Rx
 		 * and the other is used for link status changing.
 		 * In this situation, wm_nq_transmit() is disadvantageous
 		 * because of wm_select_txqueue() and pcq(9) overhead.
 		 */
 		if (wm_is_using_multiqueue(sc))
 @@ -6991,27 +6991,27 @@ wm_select_txqueue(struct ifnet *ifp, str
 /*
  * wm_start:		[ifnet interface function]
+ *
  *	Start packet transmission on the interface.
  */
 static void
 wm_start(struct ifnet *ifp)
+{
 	struct wm_softc *sc = ifp->if_softc;
 	struct wm_txqueue *txq = &sc->sc_queue[0].wmq_txq;
 #ifdef WM_MPSAFE
-	KASSERT(ifp->if_extflags & IFEF_START_MPSAFE);
+	KASSERT(if_is_mpsafe(ifp));
 #endif
 	/*
 	 * ifp->if_obytes and ifp->if_omcasts are added in if_transmit()@if.c.
 	 */
 	mutex_enter(txq->txq_lock);
 	if (!txq->txq_stopping)
 		wm_start_locked(ifp);
 	mutex_exit(txq->txq_lock);
+}
 static void
 wm_start_locked(struct ifnet *ifp)
 @@ -7584,27 +7584,27 @@ wm_nq_tx_offload(struct wm_softc *sc, st
 /*
  * wm_nq_start:		[ifnet interface function]
+ *
  *	Start packet transmission on the interface for NEWQUEUE devices
  */
 static void
 wm_nq_start(struct ifnet *ifp)
+{
 	struct wm_softc *sc = ifp->if_softc;
 	struct wm_txqueue *txq = &sc->sc_queue[0].wmq_txq;
 #ifdef WM_MPSAFE
-	KASSERT(ifp->if_extflags & IFEF_START_MPSAFE);
+	KASSERT(if_is_mpsafe(ifp));
 #endif
 	/*
 	 * ifp->if_obytes and ifp->if_omcasts are added in if_transmit()@if.c.
 	 */
 	mutex_enter(txq->txq_lock);
 	if (!txq->txq_stopping)
 		wm_nq_start_locked(ifp);
 	mutex_exit(txq->txq_lock);
+}
 static void
 wm_nq_start_locked(struct ifnet *ifp)

--- src/sys/dev/pci/ixgbe/ixgbe.c 2017/12/21 19:28:54	1.88.2.6
+++ src/sys/dev/pci/ixgbe/ixgbe.c 2018/01/02 10:20:33	1.88.2.7

 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.6 2017/12/21 19:28:54 snj Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.7 2018/01/02 10:20:33 snj Exp $ */
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -1209,27 +1209,27 @@ ixgbe_setup_interface(device_t dev, stru
 	struct ifnet   *ifp;
 	int rv;
 	INIT_DEBUGOUT("ixgbe_setup_interface: begin");
 	ifp = adapter->ifp = &ec->ec_if;
 	strlcpy(ifp->if_xname, device_xname(dev), IFNAMSIZ);
 	ifp->if_baudrate = IF_Gbps(10);
 	ifp->if_init = ixgbe_init;
 	ifp->if_stop = ixgbe_ifstop;
 	ifp->if_softc = adapter;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 #ifdef IXGBE_MPSAFE
-	ifp->if_extflags = IFEF_START_MPSAFE;
+	ifp->if_extflags = IFEF_MPSAFE;
 #endif
 	ifp->if_ioctl = ixgbe_ioctl;
 #if __FreeBSD_version >= 1100045
 	/* TSO parameters */
 	ifp->if_hw_tsomax = 65518;
 	ifp->if_hw_tsomaxsegcount = IXGBE_82599_SCATTER;
 	ifp->if_hw_tsomaxsegsize = 2048;
 #endif
 	if (adapter->feat_en & IXGBE_FEATURE_LEGACY_TX) {
 #if 0
 		ixgbe_start_locked = ixgbe_legacy_start_locked;
 #endif
 	} else {

--- src/sys/dev/pci/ixgbe/ixv.c 2017/12/21 19:28:54	1.56.2.3
+++ src/sys/dev/pci/ixgbe/ixv.c 2018/01/02 10:20:33	1.56.2.4

 @@ -1,14 +1,14 @@
-/*$NetBSD: ixv.c,v 1.56.2.3 2017/12/21 19:28:54 snj Exp $*/
+/*$NetBSD: ixv.c,v 1.56.2.4 2018/01/02 10:20:33 snj Exp $*/
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -1388,27 +1388,27 @@ ixv_setup_interface(device_t dev, struct
 	struct ifnet   *ifp;
 	int rv;
 	INIT_DEBUGOUT("ixv_setup_interface: begin");
 	ifp = adapter->ifp = &ec->ec_if;
 	strlcpy(ifp->if_xname, device_xname(dev), IFNAMSIZ);
 	ifp->if_baudrate = IF_Gbps(10);
 	ifp->if_init = ixv_init;
 	ifp->if_stop = ixv_ifstop;
 	ifp->if_softc = adapter;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 #ifdef IXGBE_MPSAFE
-	ifp->if_extflags = IFEF_START_MPSAFE;
+	ifp->if_extflags = IFEF_MPSAFE;
 #endif
 	ifp->if_ioctl = ixv_ioctl;
 	if (adapter->feat_en & IXGBE_FEATURE_LEGACY_TX) {
 #if 0
 		ixv_start_locked = ixgbe_legacy_start_locked;
 #endif
 	} else {
 		ifp->if_transmit = ixgbe_mq_start;
 #if 0
 		ixv_start_locked = ixgbe_mq_start_locked;
 #endif
+	}
 	ifp->if_start = ixgbe_legacy_start;

--- src/sys/kern/sys_socket.c 2016/07/07 06:55:43	1.74
+++ src/sys/kern/sys_socket.c 2018/01/02 10:20:33	1.74.10.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_socket.c,v 1.74 2016/07/07 06:55:43 msaitoh Exp $	*/
+/*	$NetBSD: sys_socket.c,v 1.74.10.1 2018/01/02 10:20:33 snj Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -51,27 +51,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.
+ *
  *	@(#)sys_socket.c	8.3 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.74 2016/07/07 06:55:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.74.10.1 2018/01/02 10:20:33 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/poll.h>
 #include <sys/proc.h>
 @@ -187,34 +187,38 @@ soo_ioctl(file_t *fp, u_long cmd, void *
 		error = fgetown(so->so_pgid, cmd, data);
 		break;
 	case SIOCATMARK:
 		*(int *)data = (so->so_state&SS_RCVATMARK) != 0;
 		break;
 	default:
 		/*
 		 * Interface/routing/protocol specific ioctls:
 		 * interface and routing ioctls should have a
 		 * different entry since a socket's unnecessary
 		 */
 		KERNEL_LOCK(1, NULL);
 		if (IOCGROUP(cmd) == 'i')
 			/*
 			 * KERNEL_LOCK will be held later if if_ioctl() of the
 			 * interface isn't MP-safe.
 			 */
 			error = ifioctl(so, cmd, data, curlwp);
 		else {
 			KERNEL_LOCK(1, NULL);
 			error = (*so->so_proto->pr_usrreqs->pr_ioctl)(so,
 			    cmd, data, NULL);
 			KERNEL_UNLOCK_ONE(NULL);
+		}
 		KERNEL_UNLOCK_ONE(NULL);
 		break;
+	}
 	return error;
+}
 int
 soo_fcntl(file_t *fp, u_int cmd, void *data)
+{
 	if (cmd == F_SETFL)
 		return 0;

--- src/sys/net/bpf.c 2017/12/21 21:51:37	1.216.6.3
+++ src/sys/net/bpf.c 2018/01/02 10:20:33	1.216.6.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bpf.c,v 1.216.6.3 2017/12/21 21:51:37 snj Exp $	*/
+/*	$NetBSD: bpf.c,v 1.216.6.4 2018/01/02 10:20:33 snj Exp $	*/
 /*
  * Copyright (c) 1990, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from the Stanford/CMU enet packet filter,
  * (net/enet.c) distributed as part of 4.3BSD, and code contributed
  * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
  * Berkeley Laboratory.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * 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.
+ *
  *	@(#)bpf.c	8.4 (Berkeley) 1/9/95
  * static char rcsid[] =
  * "Header: bpf.c,v 1.67 96/09/26 22:00:52 leres Exp ";
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.216.6.3 2017/12/21 21:51:37 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.216.6.4 2018/01/02 10:20:33 snj Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_bpf.h"
 #include "sl.h"
 #include "strip.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/time.h>
 @@ -474,33 +474,29 @@ bpf_detachd(struct bpf_d *d)
 	 * If so, turn it off.
 	 */
 	if (d->bd_promisc) {
 		int error __diagused;
 		d->bd_promisc = 0;
 		/*
 		 * Take device out of promiscuous mode.  Since we were
 		 * able to enter promiscuous mode, we should be able
 		 * to turn it off.  But we can get an error if
 		 * the interface was configured down, so only panic
 		 * if we don't get an unexpected error.
 		 */
-#ifndef NET_MPSAFE
+		KERNEL_LOCK_UNLESS_NET_MPSAFE();
 		KERNEL_LOCK(1, NULL);
 #endif
   		error = ifpromisc(bp->bif_ifp, 0);
-#ifndef NET_MPSAFE
+		KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 		KERNEL_UNLOCK_ONE(NULL);
 #endif
 #ifdef DIAGNOSTIC
 		if (error)
 			printf("%s: ifpromisc failed: %d", __func__, error);
 #endif
+	}
 	/* Remove d from the interface's descriptor list. */
 	BPFIF_DLIST_WRITER_REMOVE(d);
 	pserialize_perform(bpf_psz);
 	if (BPFIF_DLIST_WRITER_EMPTY(bp)) {
 		/*
 @@ -1015,33 +1011,29 @@ bpf_ioctl(struct file *fp, u_long cmd, v
 	 * Put interface into promiscuous mode.
 	 */
 	case BIOCPROMISC:
 		mutex_enter(d->bd_mtx);
 		if (d->bd_bif == NULL) {
 			mutex_exit(d->bd_mtx);
 			/*
 			 * No interface attached yet.
 			 */
 			error = EINVAL;
 			break;
+		}
 		if (d->bd_promisc == 0) {
-#ifndef NET_MPSAFE
+			KERNEL_LOCK_UNLESS_NET_MPSAFE();
 			KERNEL_LOCK(1, NULL);
 #endif
 			error = ifpromisc(d->bd_bif->bif_ifp, 1);
-#ifndef NET_MPSAFE
+			KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 			KERNEL_UNLOCK_ONE(NULL);
 #endif
 			if (error == 0)
 				d->bd_promisc = 1;
+		}
 		mutex_exit(d->bd_mtx);
 		break;
 	/*
 	 * Get device parameters.
 	 */
 	case BIOCGDLT:
 		mutex_enter(d->bd_mtx);
 		if (d->bd_bif == NULL)
 			error = EINVAL;
 @@ -2240,33 +2232,29 @@ bpf_setdlt(struct bpf_d *d, u_int dlt)
 	ifp = d->bd_bif->bif_ifp;
 	BPF_IFLIST_WRITER_FOREACH(bp) {
 		if (bp->bif_ifp == ifp && bp->bif_dlt == dlt)
 			break;
+	}
 	if (bp == NULL)
 		return EINVAL;
 	opromisc = d->bd_promisc;
 	bpf_detachd(d);
 	BPFIF_DLIST_ENTRY_INIT(d);
 	bpf_attachd(d, bp);
 	reset_d(d);
 	if (opromisc) {
-#ifndef NET_MPSAFE
+		KERNEL_LOCK_UNLESS_NET_MPSAFE();
 		KERNEL_LOCK(1, NULL);
 #endif
 		error = ifpromisc(bp->bif_ifp, 1);
-#ifndef NET_MPSAFE
+		KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 		KERNEL_UNLOCK_ONE(NULL);
 #endif
 		if (error)
 			printf("%s: bpf_setdlt: ifpromisc failed (%d)\n",
 			    bp->bif_ifp->if_xname, error);
 		else
 			d->bd_promisc = 1;
+	}
 	return 0;
+}
 static int
 sysctl_net_bpf_maxbufsize(SYSCTLFN_ARGS)
+{
 	int newsize, error;

--- src/sys/net/if.c 2017/12/10 10:10:24	1.394.2.3
+++ src/sys/net/if.c 2018/01/02 10:20:33	1.394.2.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if.c,v 1.394.2.3 2017/12/10 10:10:24 snj Exp $	*/
+/*	$NetBSD: if.c,v 1.394.2.4 2018/01/02 10:20:33 snj 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.3 2017/12/10 10:10:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.394.2.4 2018/01/02 10:20:33 snj 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"
 #endif
 #include <sys/param.h>
 #include <sys/mbuf.h>
 @@ -199,26 +199,29 @@ static kauth_listener_t if_listener;
 static int doifioctl(struct socket *, u_long, void *, struct lwp *);
 static void if_detach_queues(struct ifnet *, struct ifqueue *);
 static void sysctl_sndq_setup(struct sysctllog **, const char *,
     struct ifaltq *);
 static void if_slowtimo(void *);
 static void if_free_sadl(struct ifnet *);
 static void if_attachdomain1(struct ifnet *);
 static int ifconf(u_long, void *);
 static int if_transmit(struct ifnet *, struct mbuf *);
 static int if_clone_create(const char *);
 static int if_clone_destroy(const char *);
 static void if_link_state_change_si(void *);
 static void if_up_locked(struct ifnet *);
 static void _if_down(struct ifnet *);
 static void if_down_deactivated(struct ifnet *);
 struct if_percpuq {
 	struct ifnet	*ipq_ifp;
 	void		*ipq_si;
 	struct percpu	*ipq_ifqs;	/* struct ifqueue */
 };
 static struct mbuf *if_percpuq_dequeue(struct if_percpuq *);
 static void if_percpuq_drops(void *, void *, struct cpu_info *);
 static int sysctl_percpuq_drops_handler(SYSCTLFN_PROTO);
 static void sysctl_percpuq_setup(struct sysctllog **, const char *,
     struct if_percpuq *);
 @@ -701,43 +704,46 @@ if_initialize(ifnet_t *ifp)
 	ifp->if_snd.altq_flags &= ALTQF_CANTCHANGE;
 	ifp->if_snd.altq_tbr  = NULL;
 	ifp->if_snd.altq_ifp  = ifp;
 #endif
 	IFQ_LOCK_INIT(&ifp->if_snd);
 	ifp->if_pfil = pfil_head_create(PFIL_TYPE_IFNET, ifp);
 	pfil_run_ifhooks(if_pfil, PFIL_IFNET_ATTACH, ifp);
 	IF_AFDATA_LOCK_INIT(ifp);
 	if (if_is_link_state_changeable(ifp)) {
-		ifp->if_link_si = softint_establish(SOFTINT_NET,
+		u_int flags = SOFTINT_NET;
 		flags |= ISSET(ifp->if_extflags, IFEF_MPSAFE) ?
 		    SOFTINT_MPSAFE : 0;
 		ifp->if_link_si = softint_establish(flags,
 		    if_link_state_change_si, ifp);
 		if (ifp->if_link_si == NULL) {
 			rv = ENOMEM;
 			goto fail;
+		}
+	}
 	PSLIST_ENTRY_INIT(ifp, if_pslist_entry);
 	PSLIST_INIT(&ifp->if_addr_pslist);
 	psref_target_init(&ifp->if_psref, ifnet_psref_class);
 	ifp->if_ioctl_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
 	LIST_INIT(&ifp->if_multiaddrs);
-	IFNET_LOCK();
+	IFNET_GLOBAL_LOCK();
 	if_getindex(ifp);
-	IFNET_UNLOCK();
+	IFNET_GLOBAL_UNLOCK();
 	return 0;
 fail:
 	IF_AFDATA_LOCK_DESTROY(ifp);
 	pfil_run_ifhooks(if_pfil, PFIL_IFNET_DETACH, ifp);
 	(void)pfil_head_destroy(ifp->if_pfil);
 	IFQ_LOCK_DESTROY(&ifp->if_snd);
 	return rv;
+}
 @@ -764,30 +770,30 @@ if_register(ifnet_t *ifp)
 	rt_ifannouncemsg(ifp, IFAN_ARRIVAL);
 	if (ifp->if_slowtimo != NULL) {
 		ifp->if_slowtimo_ch =
 		    kmem_zalloc(sizeof(*ifp->if_slowtimo_ch), KM_SLEEP);
 		callout_init(ifp->if_slowtimo_ch, 0);
 		callout_setfunc(ifp->if_slowtimo_ch, if_slowtimo, ifp);
 		if_slowtimo(ifp);
+	}
 	if (ifp->if_transmit == NULL || ifp->if_transmit == if_nulltransmit)
 		ifp->if_transmit = if_transmit;
-	IFNET_LOCK();
+	IFNET_GLOBAL_LOCK();
 	TAILQ_INSERT_TAIL(&ifnet_list, ifp, if_list);
 	IFNET_WRITER_INSERT_TAIL(ifp);
-	IFNET_UNLOCK();
+	IFNET_GLOBAL_UNLOCK();
+}
 /*
  * The if_percpuq framework
+ *
  * It allows network device drivers to execute the network stack
  * in softint (so called softint-based if_input). It utilizes
  * softint and percpu ifqueue. It doesn't distribute any packets
  * between CPUs, unlike pktqueue(9).
+ *
  * Currently we support two options for device drivers to apply the framework:
  * - Use it implicitly with less changes
  *   - If you use if_attach in driver's _attach function and if_input in
 @@ -1296,56 +1302,42 @@ if_detach(struct ifnet *ifp)
 #ifdef IFAREF_DEBUG
 	if_build_ifa_list(ifp);
 #endif
 	/*
 	 * XXX It's kind of lame that we have to have the
 	 * XXX socket structure...
 	 */
 	memset(&so, 0, sizeof(so));
 	s = splnet();
 	sysctl_teardown(&ifp->if_sysctl_log);
-	mutex_enter(ifp->if_ioctl_lock);
+	IFNET_LOCK(ifp);
 	if_deactivate(ifp);
-	mutex_exit(ifp->if_ioctl_lock);
+	IFNET_UNLOCK(ifp);
 	IFNET_LOCK();
 	ifindex2ifnet[ifp->if_index] = NULL;
 	TAILQ_REMOVE(&ifnet_list, ifp, if_list);
 	IFNET_WRITER_REMOVE(ifp);
 	pserialize_perform(ifnet_psz);
 	IFNET_UNLOCK();
 	/* Wait for all readers to drain before freeing.  */
 	psref_target_destroy(&ifp->if_psref, ifnet_psref_class);
 	PSLIST_ENTRY_DESTROY(ifp, if_pslist_entry);
 	mutex_obj_free(ifp->if_ioctl_lock);
 	ifp->if_ioctl_lock = NULL;
 	if (ifp->if_slowtimo != NULL && ifp->if_slowtimo_ch != NULL) {
 		ifp->if_slowtimo = NULL;
 		callout_halt(ifp->if_slowtimo_ch, NULL);
 		callout_destroy(ifp->if_slowtimo_ch);
 		kmem_free(ifp->if_slowtimo_ch, sizeof(*ifp->if_slowtimo_ch));
+	}
 	if_deferred_start_destroy(ifp);
 	/*
 	 * Do an if_down() to give protocols a chance to do something.
 	 */
-	if_down(ifp);
+	if_down_deactivated(ifp);
 #ifdef ALTQ
 	if (ALTQ_IS_ENABLED(&ifp->if_snd))
 		altq_disable(&ifp->if_snd);
 	if (ALTQ_IS_ATTACHED(&ifp->if_snd))
 		altq_detach(&ifp->if_snd);
 #endif
 	mutex_obj_free(ifp->if_snd.ifq_lock);
 #if NCARP > 0
 	/* Remove the interface from any carp group it is a part of.  */
 	if (ifp->if_carp != NULL && ifp->if_type != IFT_CARP)
 @@ -1358,29 +1350,31 @@ if_detach(struct ifnet *ifp)
+	 *
 	 * pr_usrreq calls can remove an arbitrary number of ifaddrs
 	 * from the list, including our "cursor", ifa.  For safety,
 	 * and to honor the TAILQ abstraction, I just restart the
 	 * loop after each removal.  Note that the loop will exit
 	 * when all of the remaining ifaddrs belong to the AF_LINK
 	 * family.  I am counting on the historical fact that at
 	 * least one pr_usrreq in each address domain removes at
 	 * least one ifaddr.
 	 */
 again:
 	/*
 	 * At this point, no other one tries to remove ifa in the list,
-	 * so we don't need to take a lock or psref.
+	 * so we don't need to take a lock or psref.  Avoid using
 	 * IFADDR_READER_FOREACH to pass over an inspection of contract
 	 * violations of pserialize.
 	 */
-	IFADDR_READER_FOREACH(ifa, ifp) {
+	IFADDR_WRITER_FOREACH(ifa, ifp) {
 		family = ifa->ifa_addr->sa_family;
 #ifdef IFAREF_DEBUG
 		printf("if_detach: ifaddr %p, family %d, refcnt %d\n",
 		    ifa, family, ifa->ifa_refcnt);
 		if (last_ifa != NULL && ifa == last_ifa)
 			panic("if_detach: loop detected");
 		last_ifa = ifa;
 #endif
 		if (family == AF_LINK)
 			continue;
 		dp = pffinddomain(family);
 		KASSERTMSG(dp != NULL, "no domain for AF %d", family);
 		/*
 @@ -1437,26 +1431,37 @@ again:
 		 * Because there is no invariant that multicast
 		 * memberships only exist for interfaces with IPv4
 		 * addresses, we must call PURGEIF regardless of
 		 * addresses.  (Protocols which might store ifnet
 		 * pointers are marked with PR_PURGEIF.)
 		 */
 		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) {
 			so.so_proto = pr;
 			if (pr->pr_usrreqs && pr->pr_flags & PR_PURGEIF)
 				(void)(*pr->pr_usrreqs->pr_purgeif)(&so, ifp);
+		}
+	}
 	/* Wait for all readers to drain before freeing.  */
 	IFNET_GLOBAL_LOCK();
 	ifindex2ifnet[ifp->if_index] = NULL;
 	TAILQ_REMOVE(&ifnet_list, ifp, if_list);
 	IFNET_WRITER_REMOVE(ifp);
 	pserialize_perform(ifnet_psz);
 	IFNET_GLOBAL_UNLOCK();
 	psref_target_destroy(&ifp->if_psref, ifnet_psref_class);
 	PSLIST_ENTRY_DESTROY(ifp, if_pslist_entry);
 	pfil_run_ifhooks(if_pfil, PFIL_IFNET_DETACH, ifp);
 	(void)pfil_head_destroy(ifp->if_pfil);
 	/* Announce that the interface is gone. */
 	rt_ifannouncemsg(ifp, IFAN_DEPARTURE);
 	IF_AFDATA_LOCK_DESTROY(ifp);
 	if (if_is_link_state_changeable(ifp)) {
 		softint_disestablish(ifp->if_link_si);
 		ifp->if_link_si = NULL;
+	}
 @@ -1483,26 +1488,29 @@ again:
 #endif
 #ifdef INET6
 	if (in6_present)
 		pktq_barrier(ip6_pktq);
 #endif
 	xc = xc_broadcast(0, (xcfunc_t)nullop, NULL, NULL);
 	xc_wait(xc);
 	if (ifp->if_percpuq != NULL) {
 		if_percpuq_destroy(ifp->if_percpuq);
 		ifp->if_percpuq = NULL;
+	}
 	mutex_obj_free(ifp->if_ioctl_lock);
 	ifp->if_ioctl_lock = NULL;
 	splx(s);
 #ifdef IFAREF_DEBUG
 	if_check_and_free_ifa_list(ifp);
 #endif
+}
 static void
 if_detach_queues(struct ifnet *ifp, struct ifqueue *q)
+{
 	struct mbuf *m, *prev, *next;
 	prev = NULL;
 @@ -1584,29 +1592,29 @@ if_clone_destroy(const char *name)
 	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 */
-	mutex_enter(ifp->if_ioctl_lock);
+	IFNET_LOCK(ifp);
 	ifp->if_ioctl = if_nullioctl;
-	mutex_exit(ifp->if_ioctl_lock);
+	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);
+}
 static bool
 if_is_unit(const char *name)
+{
 @@ -1773,48 +1781,60 @@ ifafree(struct ifaddr *ifa)
 bool
 ifa_is_destroying(struct ifaddr *ifa)
+{
 	return ISSET(ifa->ifa_flags, IFA_DESTROYING);
+}
 void
 ifa_insert(struct ifnet *ifp, struct ifaddr *ifa)
+{
 	ifa->ifa_ifp = ifp;
-	IFNET_LOCK();
+	/*
 	 * Check !IFF_RUNNING for initialization routines that normally don't
 	 * take IFNET_LOCK but it's safe because there is no competitor.
 	 * XXX there are false positive cases because IFF_RUNNING can be off on
 	 * if_stop.
 	 */
 	KASSERT(!ISSET(ifp->if_flags, IFF_RUNNING) ||
 	    IFNET_LOCKED(ifp));
 	TAILQ_INSERT_TAIL(&ifp->if_addrlist, ifa, ifa_list);
 	IFADDR_ENTRY_INIT(ifa);
 	IFADDR_WRITER_INSERT_TAIL(ifp, ifa);
 	IFNET_UNLOCK();
 	ifaref(ifa);
+}
 void
 ifa_remove(struct ifnet *ifp, struct ifaddr *ifa)
+{
 	KASSERT(ifa->ifa_ifp == ifp);
 	/*
 	 * if_is_deactivated indicates ifa_remove is called form if_detach
 	 * where is safe even if IFNET_LOCK isn't held.
 	 */
 	KASSERT(if_is_deactivated(ifp) || IFNET_LOCKED(ifp));
 	IFNET_LOCK();
 	TAILQ_REMOVE(&ifp->if_addrlist, ifa, ifa_list);
 	IFADDR_WRITER_REMOVE(ifa);
 #ifdef NET_MPSAFE
 	IFNET_GLOBAL_LOCK();
 	pserialize_perform(ifnet_psz);
 	IFNET_GLOBAL_UNLOCK();
 #endif
 	IFNET_UNLOCK();
 #ifdef NET_MPSAFE
 	psref_target_destroy(&ifa->ifa_psref, ifa_psref_class);
 #endif
 	IFADDR_ENTRY_DESTROY(ifa);
 	ifafree(ifa);
+}
 void
 ifa_acquire(struct ifaddr *ifa, struct psref *psref)
+{
 	psref_acquire(psref, &ifa->ifa_psref, ifa_psref_class);
 @@ -2174,54 +2194,69 @@ link_rtrequest(int cmd, struct rtentry *
 		(q) >>= LQ_ITEM_BITS;					      \
 		(q) |= LINK_STATE_UNSET << (LQ_MAX((q)) - 1) * LQ_ITEM_BITS;  \
 	} while (0 /* CONSTCOND */)
 #define LQ_PUSH(q, v)							      \
 	do {								      \
 		(q) >>= LQ_ITEM_BITS;					      \
 		(q) |= (v) << (LQ_MAX((q)) - 1) * LQ_ITEM_BITS;		      \
 	} while (0 /* CONSTCOND */)
 #define LQ_FIND_UNSET(q, i)						      \
 	for ((i) = 0; i < LQ_MAX((q)); (i)++) {				      \
 		if (LQ_ITEM((q), (i)) == LINK_STATE_UNSET)		      \
 			break;						      \
+	}
 /*
  * XXX reusing (ifp)->if_snd->ifq_lock rather than having another spin mutex
  * for each ifnet.  It doesn't matter because:
  * - if IFEF_MPSAFE is enabled, if_snd isn't used and lock contentions on
  *   ifq_lock don't happen
  * - if IFEF_MPSAFE is disabled, there is no lock contention on ifq_lock
  *   because if_snd, if_link_state_change and if_link_state_change_softint
  *   are all called with KERNEL_LOCK
  */
 #define IF_LINK_STATE_CHANGE_LOCK(ifp)		\
 	mutex_enter((ifp)->if_snd.ifq_lock)
 #define IF_LINK_STATE_CHANGE_UNLOCK(ifp)	\
 	mutex_exit((ifp)->if_snd.ifq_lock)
 /*
  * Handle a change in the interface link state and
  * queue notifications.
  */
 void
 if_link_state_change(struct ifnet *ifp, int link_state)
+{
-	int s, idx;
+	int idx;
 	KASSERTMSG(if_is_link_state_changeable(ifp),
 	    "%s: IFEF_NO_LINK_STATE_CHANGE must not be set, but if_extflags=0x%x",
 	    ifp->if_xname, ifp->if_extflags);
 	/* Ensure change is to a valid state */
 	switch (link_state) {
 	case LINK_STATE_UNKNOWN:	/* FALLTHROUGH */
 	case LINK_STATE_DOWN:		/* FALLTHROUGH */
 	case LINK_STATE_UP:
 		break;
 	default:
 #ifdef DEBUG
 		printf("%s: invalid link state %d\n",
 		    ifp->if_xname, link_state);
 #endif
 		return;
+	}
-	s = splnet();
+	IF_LINK_STATE_CHANGE_LOCK(ifp);
 	/* Find the last unset event in the queue. */
 	LQ_FIND_UNSET(ifp->if_link_queue, idx);
 	/*
 	 * Ensure link_state doesn't match the last event in the queue.
 	 * ifp->if_link_state is not checked and set here because
 	 * that would present an inconsistent picture to the system.
 	 */
 	if (idx != 0 &&
 	    LQ_ITEM(ifp->if_link_queue, idx - 1) == (uint8_t)link_state)
 		goto out;
 @@ -2245,121 +2280,129 @@ if_link_state_change(struct ifnet *ifp,
 			LQ_STORE(ifp->if_link_queue, 0, LINK_STATE_DOWN);
+		}
 		printf("%s: lost link state change %s\n",
 		    ifp->if_xname,
 		    lost == LINK_STATE_UP ? "UP" :
 		    lost == LINK_STATE_DOWN ? "DOWN" :
 		    "UNKNOWN");
 	} else
 		LQ_STORE(ifp->if_link_queue, idx, (uint8_t)link_state);
 	softint_schedule(ifp->if_link_si);
 out:
-	splx(s);
+	IF_LINK_STATE_CHANGE_UNLOCK(ifp);
+}
 /*
  * Handle interface link state change notifications.
  */
 void
 if_link_state_change_softint(struct ifnet *ifp, int link_state)
+{
 	struct domain *dp;
 	int s = splnet();
 	bool notify;
 	KASSERT(!cpu_intr_p());
 	IF_LINK_STATE_CHANGE_LOCK(ifp);
 	/* Ensure the change is still valid. */
 	if (ifp->if_link_state == link_state) {
-		splx(s);
+		IF_LINK_STATE_CHANGE_UNLOCK(ifp);
 		return;
+	}
 #ifdef DEBUG
 	log(LOG_DEBUG, "%s: link state %s (was %s)\n", ifp->if_xname,
 		link_state == LINK_STATE_UP ? "UP" :
 		link_state == LINK_STATE_DOWN ? "DOWN" :
 		"UNKNOWN",
 		ifp->if_link_state == LINK_STATE_UP ? "UP" :
 		ifp->if_link_state == LINK_STATE_DOWN ? "DOWN" :
 		"UNKNOWN");
 #endif
 	/*
 	 * When going from UNKNOWN to UP, we need to mark existing
 	 * addresses as tentative and restart DAD as we may have
 	 * erroneously not found a duplicate.
+	 *
 	 * This needs to happen before rt_ifmsg to avoid a race where
 	 * listeners would have an address and expect it to work right
 	 * away.
 	 */
-	if (link_state == LINK_STATE_UP &&
+	notify = (link_state == LINK_STATE_UP &&
-	    ifp->if_link_state == LINK_STATE_UNKNOWN)
+	    ifp->if_link_state == LINK_STATE_UNKNOWN);
 	ifp->if_link_state = link_state;
 	/* The following routines may sleep so release the spin mutex */
 	IF_LINK_STATE_CHANGE_UNLOCK(ifp);
 	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	if (notify) {
 		DOMAIN_FOREACH(dp) {
 			if (dp->dom_if_link_state_change != NULL)
 				dp->dom_if_link_state_change(ifp,
 				    LINK_STATE_DOWN);
+		}
+	}
 	ifp->if_link_state = link_state;
 	/* Notify that the link state has changed. */
 	rt_ifmsg(ifp);
 #if NCARP > 0
 	if (ifp->if_carp)
 		carp_carpdev_state(ifp);
 #endif
 	DOMAIN_FOREACH(dp) {
 		if (dp->dom_if_link_state_change != NULL)
 			dp->dom_if_link_state_change(ifp, link_state);
+	}
 	KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	splx(s);
+}
 /*
  * Process the interface link state change queue.
  */
 static void
 if_link_state_change_si(void *arg)
+{
 	struct ifnet *ifp = arg;
 	int s;
 	uint8_t state;
 	bool schedule;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	s = splnet();
 	/* Pop a link state change from the queue and process it. */
 	IF_LINK_STATE_CHANGE_LOCK(ifp);
 	LQ_POP(ifp->if_link_queue, state);
 	IF_LINK_STATE_CHANGE_UNLOCK(ifp);
 	if_link_state_change_softint(ifp, state);
 	/* If there is a link state change to come, schedule it. */
-	if (LQ_ITEM(ifp->if_link_queue, 0) != LINK_STATE_UNSET)
+	IF_LINK_STATE_CHANGE_LOCK(ifp);
 	schedule = (LQ_ITEM(ifp->if_link_queue, 0) != LINK_STATE_UNSET);
 	IF_LINK_STATE_CHANGE_UNLOCK(ifp);
 	if (schedule)
 		softint_schedule(ifp->if_link_si);
 	splx(s);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 /*
  * Default action when installing a local route on a point-to-point
  * interface.
  */
 void
 p2p_rtrequest(int req, struct rtentry *rt,
     __unused const struct rt_addrinfo *info)
+{
 	struct ifnet *ifp = rt->rt_ifp;
 	struct ifaddr *ifa, *lo0ifa;
 	int s = pserialize_read_enter();
 @@ -2394,33 +2437,28 @@ p2p_rtrequest(int req, struct rtentry *r
 		 * address we are using, otherwise we will have trouble
 		 * with source address selection.
 		 */
 		if (ifa != rt->rt_ifa)
 			rt_replace_ifa(rt, ifa);
 		break;
 	case RTM_DELETE:
 	default:
 		break;
+	}
 	pserialize_read_exit(s);
+}
-/*
+static void
- * Mark an interface down and notify protocols of
+_if_down(struct ifnet *ifp)
  * the transition.
  * NOTE: must be called at splsoftnet or equivalent.
  */
 void
 if_down(struct ifnet *ifp)
+{
 	struct ifaddr *ifa;
 	struct domain *dp;
 	int s, bound;
 	struct psref psref;
 	ifp->if_flags &= ~IFF_UP;
 	nanotime(&ifp->if_lastchange);
 	bound = curlwp_bind();
 	s = pserialize_read_enter();
 	IFADDR_READER_FOREACH(ifa, ifp) {
 		ifa_acquire(ifa, &psref);
 @@ -2436,39 +2474,70 @@ if_down(struct ifnet *ifp)
 	IFQ_PURGE(&ifp->if_snd);
 #if NCARP > 0
 	if (ifp->if_carp)
 		carp_carpdev_state(ifp);
 #endif
 	rt_ifmsg(ifp);
 	DOMAIN_FOREACH(dp) {
 		if (dp->dom_if_down)
 			dp->dom_if_down(ifp);
+	}
+}
 static void
 if_down_deactivated(struct ifnet *ifp)
+{
 	KASSERT(if_is_deactivated(ifp));
 	_if_down(ifp);
+}
 void
 if_down_locked(struct ifnet *ifp)
+{
 	KASSERT(IFNET_LOCKED(ifp));
 	_if_down(ifp);
+}
 /*
- * Mark an interface up and notify protocols of
+ * Mark an interface down and notify protocols of
  * the transition.
  * NOTE: must be called at splsoftnet or equivalent.
  */
 void
-if_up(struct ifnet *ifp)
+if_down(struct ifnet *ifp)
+{
 	IFNET_LOCK(ifp);
 	if_down_locked(ifp);
 	IFNET_UNLOCK(ifp);
+}
 /*
  * Must be called with holding if_ioctl_lock.
  */
 static void
 if_up_locked(struct ifnet *ifp)
+{
 #ifdef notyet
 	struct ifaddr *ifa;
 #endif
 	struct domain *dp;
 	KASSERT(IFNET_LOCKED(ifp));
 	KASSERT(!if_is_deactivated(ifp));
 	ifp->if_flags |= IFF_UP;
 	nanotime(&ifp->if_lastchange);
 #ifdef notyet
 	/* this has no effect on IP, and will kill all ISO connections XXX */
 	IFADDR_READER_FOREACH(ifa, ifp)
 		pfctlinput(PRC_IFUP, ifa->ifa_addr);
 #endif
 #if NCARP > 0
 	if (ifp->if_carp)
 		carp_carpdev_state(ifp);
 #endif
 	rt_ifmsg(ifp);
 	DOMAIN_FOREACH(dp) {
 @@ -2494,60 +2563,89 @@ if_slowtimo(void *arg)
 		return;
 	s = splnet();
 	if (ifp->if_timer != 0 && --ifp->if_timer == 0)
 		(*slowtimo)(ifp);
 	splx(s);
 	if (__predict_true(ifp->if_slowtimo != NULL))
 		callout_schedule(ifp->if_slowtimo_ch, hz / IFNET_SLOWHZ);
+}
 /*
  * Mark an interface up and notify protocols of
  * the transition.
  * NOTE: must be called at splsoftnet or equivalent.
  */
 void
 if_up(struct ifnet *ifp)
+{
 	IFNET_LOCK(ifp);
 	if_up_locked(ifp);
 	IFNET_UNLOCK(ifp);
+}
 /*
  * Set/clear promiscuous mode on interface ifp based on the truth value
  * of pswitch.  The calls are reference counted so that only the first
  * "on" request actually has an effect, as does the final "off" request.
  * Results are undefined if the "off" and "on" requests are not matched.
  */
 int
-ifpromisc(struct ifnet *ifp, int pswitch)
+ifpromisc_locked(struct ifnet *ifp, int pswitch)
+{
-	int pcount, ret;
+	int pcount, ret = 0;
 	short nflags;
 	KASSERT(IFNET_LOCKED(ifp));
 	pcount = ifp->if_pcount;
 	if (pswitch) {
 		/*
 		 * Allow the device to be "placed" into promiscuous
 		 * mode even if it is not configured up.  It will
 		 * consult IFF_PROMISC when it is brought up.
 		 */
 		if (ifp->if_pcount++ != 0)
-			return 0;
+			goto out;
 		nflags = ifp->if_flags | IFF_PROMISC;
 	} else {
 		if (--ifp->if_pcount > 0)
-			return 0;
+			goto out;
 		nflags = ifp->if_flags & ~IFF_PROMISC;
+	}
 	ret = if_flags_set(ifp, nflags);
 	/* Restore interface state if not successful. */
 	if (ret != 0) {
 		ifp->if_pcount = pcount;
+	}
 out:
 	return ret;
+}
 int
 ifpromisc(struct ifnet *ifp, int pswitch)
+{
 	int e;
 	IFNET_LOCK(ifp);
 	e = ifpromisc_locked(ifp, pswitch);
 	IFNET_UNLOCK(ifp);
 	return e;
+}
 /*
  * Map interface name to
  * interface structure pointer.
  */
 struct ifnet *
 ifunit(const char *name)
+{
 	struct ifnet *ifp;
 	const char *cp = name;
 	u_int unit = 0;
 	u_int i;
 	int s;
 @@ -2624,32 +2722,47 @@ out:
  * Release a reference of an ifnet object given by if_get, if_get_byindex
  * or if_get_bylla.
  */
 void
 if_put(const struct ifnet *ifp, struct psref *psref)
+{
 	if (ifp == NULL)
 		return;
 	psref_release(psref, &ifp->if_psref, ifnet_psref_class);
+}
 /*
  * Return ifp having idx. Return NULL if not found.  Normally if_byindex
  * should be used.
  */
 ifnet_t *
 _if_byindex(u_int idx)
+{
 	return (__predict_true(idx < if_indexlim)) ? ifindex2ifnet[idx] : NULL;
+}
 /*
  * Return ifp having idx. Return NULL if not found or the found ifp is
  * already deactivated.
  */
 ifnet_t *
 if_byindex(u_int idx)
+{
 	ifnet_t *ifp;
-	ifp = (__predict_true(idx < if_indexlim)) ? ifindex2ifnet[idx] : NULL;
+	ifp = _if_byindex(idx);
 	if (ifp != NULL && if_is_deactivated(ifp))
 		ifp = NULL;
 	return ifp;
+}
 /*
  * Get a reference of an ifnet object by an interface index.
  * The returned reference is protected by psref(9). The caller
  * must release a returned reference by if_put after use.
  */
 ifnet_t *
 if_get_byindex(u_int idx, struct psref *psref)
+{
 @@ -2761,36 +2874,42 @@ ifioctl_common(struct ifnet *ifp, u_long
+		}
 		if (ifp->if_capenable & IFCAP_CSUM_UDPv6_Tx) {
 			ifp->if_csum_flags_tx |= M_CSUM_UDPv6;
+		}
 		if (ifp->if_capenable & IFCAP_CSUM_UDPv6_Rx) {
 			ifp->if_csum_flags_rx |= M_CSUM_UDPv6;
+		}
 		if (ifp->if_flags & IFF_UP)
 			return ENETRESET;
 		return 0;
 	case SIOCSIFFLAGS:
 		ifr = data;
 		/*
 		 * If if_is_mpsafe(ifp), KERNEL_LOCK isn't held here, but if_up
 		 * and if_down aren't MP-safe yet, so we must hold the lock.
 		 */
 		KERNEL_LOCK_IF_IFP_MPSAFE(ifp);
 		if (ifp->if_flags & IFF_UP && (ifr->ifr_flags & IFF_UP) == 0) {
 			s = splsoftnet();
-			if_down(ifp);
+			if_down_locked(ifp);
 			splx(s);
+		}
 		if (ifr->ifr_flags & IFF_UP && (ifp->if_flags & IFF_UP) == 0) {
 			s = splsoftnet();
-			if_up(ifp);
+			if_up_locked(ifp);
 			splx(s);
+		}
 		KERNEL_UNLOCK_IF_IFP_MPSAFE(ifp);
 		ifp->if_flags = (ifp->if_flags & IFF_CANTCHANGE) |
 			(ifr->ifr_flags &~ IFF_CANTCHANGE);
 		break;
 	case SIOCGIFFLAGS:
 		ifr = data;
 		ifr->ifr_flags = ifp->if_flags;
 		break;
 	case SIOCGIFMETRIC:
 		ifr = data;
 		ifr->ifr_metric = ifp->if_metric;
 		break;
 @@ -2842,28 +2961,30 @@ ifioctl_common(struct ifnet *ifp, u_long
 		 * And also, update if_lastchnage.
 		 */
 		getnanotime(&ifp->if_lastchange);
 		break;
 	case SIOCSIFMTU:
 		ifr = data;
 		if (ifp->if_mtu == ifr->ifr_mtu)
 			break;
 		ifp->if_mtu = ifr->ifr_mtu;
 		/*
 		 * If the link MTU changed, do network layer specific procedure.
 		 */
 #ifdef INET6
 		KERNEL_LOCK_UNLESS_NET_MPSAFE();
 		if (in6_present)
 			nd6_setmtu(ifp);
 		KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 #endif
 		return ENETRESET;
 	default:
 		return ENOTTY;
+	}
 	return 0;
+}
 int
 ifaddrpref_ioctl(struct socket *so, u_long cmd, void *data, struct ifnet *ifp)
+{
 	struct if_addrprefreq *ifap = (struct if_addrprefreq *)data;
 	struct ifaddr *ifa;
 @@ -2987,31 +3108,33 @@ doifioctl(struct socket *so, u_long cmd,
 		if (l != NULL) {
 			ifp = if_get(ifr->ifr_name, &psref);
 			error = kauth_authorize_network(l->l_cred,
 			    KAUTH_NETWORK_INTERFACE,
 			    KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp,
 			    (void *)cmd, NULL);
 			if (ifp != NULL)
 				if_put(ifp, &psref);
 			if (error != 0) {
 				curlwp_bindx(bound);
 				return error;
+			}
+		}
 		KERNEL_LOCK_UNLESS_NET_MPSAFE();
 		mutex_enter(&if_clone_mtx);
 		r = (cmd == SIOCIFCREATE) ?
 			if_clone_create(ifr->ifr_name) :
 			if_clone_destroy(ifr->ifr_name);
 		mutex_exit(&if_clone_mtx);
 		KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 		curlwp_bindx(bound);
 		return r;
 	case SIOCIFGCLONERS:
+		{
 			struct if_clonereq *req = (struct if_clonereq *)data;
 			return if_clone_list(req->ifcr_count, req->ifcr_buffer,
 			    &req->ifcr_total);
+		}
+	}
 	bound = curlwp_bind();
 	ifp = if_get(ifr->ifr_name, &psref);
 @@ -3049,56 +3172,60 @@ doifioctl(struct socket *so, u_long cmd,
 	case SIOCSLINKSTR:
 		if (l != NULL) {
 			error = kauth_authorize_network(l->l_cred,
 			    KAUTH_NETWORK_INTERFACE,
 			    KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp,
 			    (void *)cmd, NULL);
 			if (error != 0)
 				goto out;
+		}
+	}
 	oif_flags = ifp->if_flags;
-	mutex_enter(ifp->if_ioctl_lock);
+	KERNEL_LOCK_UNLESS_IFP_MPSAFE(ifp);
 	IFNET_LOCK(ifp);
 	error = (*ifp->if_ioctl)(ifp, cmd, data);
 	if (error != ENOTTY)
+		;
 	else if (so->so_proto == NULL)
 		error = EOPNOTSUPP;
 	else {
 		KERNEL_LOCK_IF_IFP_MPSAFE(ifp);
 #ifdef COMPAT_OSOCK
 		if (vec_compat_ifioctl != NULL)
 			error = (*vec_compat_ifioctl)(so, ocmd, cmd, data, l);
 		else
 #endif
 			error = (*so->so_proto->pr_usrreqs->pr_ioctl)(so,
 			    cmd, data, ifp);
 		KERNEL_UNLOCK_IF_IFP_MPSAFE(ifp);
+	}
 	if (((oif_flags ^ ifp->if_flags) & IFF_UP) != 0) {
 		if ((ifp->if_flags & IFF_UP) != 0) {
 			int s = splsoftnet();
-			if_up(ifp);
+			if_up_locked(ifp);
 			splx(s);
+		}
+	}
 #ifdef COMPAT_OIFREQ
 	if (cmd != ocmd)
 		ifreqn2o(oifr, ifr);
 #endif
-	mutex_exit(ifp->if_ioctl_lock);
+	IFNET_UNLOCK(ifp);
 	KERNEL_UNLOCK_UNLESS_IFP_MPSAFE(ifp);
 out:
 	if_put(ifp, &psref);
 	curlwp_bindx(bound);
 	return error;
+}
 /*
  * Return interface configuration
  * of system.  List may be used
  * in later ioctl's (above) to get
  * other information.
+ *
  * Each record is a struct ifreq.  Before the addition of
 @@ -3335,30 +3462,30 @@ ifq_enqueue2(struct ifnet *ifp, struct i
 		IFQ_ENQUEUE(&ifp->if_snd, m, error);
 	if (error != 0) {
 		++ifp->if_oerrors;
 		return error;
+	}
 	return 0;
+}
 int
 if_addr_init(ifnet_t *ifp, struct ifaddr *ifa, const bool src)
+{
 	int rc;
 	KASSERT(IFNET_LOCKED(ifp));
 	if (ifp->if_initaddr != NULL)
 		rc = (*ifp->if_initaddr)(ifp, ifa, src);
 	else if (src ||
 		/* FIXME: may not hold if_ioctl_lock */
 	         (rc = (*ifp->if_ioctl)(ifp, SIOCSIFDSTADDR, ifa)) == ENOTTY)
 		rc = (*ifp->if_ioctl)(ifp, SIOCINITIFADDR, ifa);
 	return rc;
+}
 int
 if_do_dad(struct ifnet *ifp)
+{
 	if ((ifp->if_flags & IFF_LOOPBACK) != 0)
 		return 0;
 	switch (ifp->if_type) {
 @@ -3383,64 +3510,69 @@ if_do_dad(struct ifnet *ifp)
 		if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) !=
 		    (IFF_UP|IFF_RUNNING))
 			return 0;
 		return 1;
+	}
+}
 int
 if_flags_set(ifnet_t *ifp, const short flags)
+{
 	int rc;
 	KASSERT(IFNET_LOCKED(ifp));
 	if (ifp->if_setflags != NULL)
 		rc = (*ifp->if_setflags)(ifp, flags);
 	else {
 		short cantflags, chgdflags;
 		struct ifreq ifr;
 		chgdflags = ifp->if_flags ^ flags;
 		cantflags = chgdflags & IFF_CANTCHANGE;
 		if (cantflags != 0)
 			ifp->if_flags ^= cantflags;
                 /* Traditionally, we do not call if_ioctl after
                  * setting/clearing only IFF_PROMISC if the interface
                  * isn't IFF_UP.  Uphold that tradition.
 		 */
 		if (chgdflags == IFF_PROMISC && (ifp->if_flags & IFF_UP) == 0)
 			return 0;
 		memset(&ifr, 0, sizeof(ifr));
 		ifr.ifr_flags = flags & ~IFF_CANTCHANGE;
 		/* FIXME: may not hold if_ioctl_lock */
 		rc = (*ifp->if_ioctl)(ifp, SIOCSIFFLAGS, &ifr);
 		if (rc != 0 && cantflags != 0)
 			ifp->if_flags ^= cantflags;
+	}
 	return rc;
+}
 int
 if_mcast_op(ifnet_t *ifp, const unsigned long cmd, const struct sockaddr *sa)
+{
 	int rc;
 	struct ifreq ifr;
 	/* CARP still doesn't deal with the lock yet */
 #if !defined(NCARP) || (NCARP == 0)
 	KASSERT(IFNET_LOCKED(ifp));
 #endif
 	if (ifp->if_mcastop != NULL)
 		rc = (*ifp->if_mcastop)(ifp, cmd, sa);
 	else {
 		ifreq_setaddr(cmd, &ifr, sa);
 		rc = (*ifp->if_ioctl)(ifp, cmd, &ifr);
+	}
 	return rc;
+}
 static void
 sysctl_sndq_setup(struct sysctllog **clog, const char *ifname,
     struct ifaltq *ifq)

--- src/sys/net/if.h 2017/12/10 10:10:24	1.239.2.2
+++ src/sys/net/if.h 2018/01/02 10:20:33	1.239.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if.h,v 1.239.2.2 2017/12/10 10:10:24 snj Exp $	*/
+/*	$NetBSD: if.h,v 1.239.2.3 2018/01/02 10:20:33 snj Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001 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.
 @@ -225,138 +225,174 @@ struct ifqueue {
  */
 TAILQ_HEAD(ifnet_head, ifnet);		/* the actual queue head */
 struct bridge_softc;
 struct bridge_iflist;
 struct callout;
 struct krwlock;
 struct if_percpuq;
 struct if_deferred_start;
 struct in6_multi;
 typedef unsigned short if_index_t;
 /*
  * Interface.  Field markings and the corresponding locks:
+ *
  * i:	IFNET_LOCK (a.k.a., if_ioctl_lock)
  * q:	ifq_lock (struct ifaltq)
  * a:	if_afdata_lock
  * 6:	in6_multilock (global lock)
  * ::	unlocked, stable
  * ?:	unkown, maybe unsafe
+ *
  * Lock order: IFNET_LOCK => in6_multilock => if_afdata_lock => ifq_lock
  *   Note that currently if_afdata_lock and ifq_lock aren't held
  *   at the same time, but define the order anyway.
+ *
  * Lock order of IFNET_LOCK with other locks:
  *     softnet_lock => solock => IFNET_LOCK => ND6_LOCK, in_multilock
  */
 typedef struct ifnet {
-	void	*if_softc;		/* lower-level data for this if */
+	void		*if_softc;	/* :: lower-level data for this if */
 	/* DEPRECATED. Keep it to avoid breaking kvm(3) users */
-	TAILQ_ENTRY(ifnet) if_list;	/* all struct ifnets are chained */
+	TAILQ_ENTRY(ifnet)
-	TAILQ_HEAD(, ifaddr) if_addrlist; /* linked list of addresses per if */
+			if_list;	/* i: all struct ifnets are chained */
-	char	if_xname[IFNAMSIZ];	/* external name (name + unit) */
+	TAILQ_HEAD(, ifaddr)
-	int	if_pcount;		/* number of promiscuous listeners */
+			if_addrlist;	/* i: linked list of addresses per if */
-	struct bpf_if *if_bpf;		/* packet filter structure */
+	char		if_xname[IFNAMSIZ];
-	if_index_t	if_index;	/* numeric abbreviation for this if */
+					/* :: external name (name + unit) */
-	short	if_timer;		/* time 'til if_slowtimo called */
+	int		if_pcount;	/* i: number of promiscuous listeners */
-	unsigned short	if_flags;	/* up/down, broadcast, etc. */
+	struct bpf_if	*if_bpf;	/* :: packet filter structure */
-	short	if_extflags;		/* if_output MP-safe, etc. */
+	if_index_t	if_index;	/* :: numeric abbreviation for this if */
-	struct	if_data if_data;	/* statistics and other data about if */
+	short		if_timer;	/* ?: time 'til if_slowtimo called */
 	unsigned short	if_flags;	/* i: up/down, broadcast, etc. */
 	short		if_extflags;	/* :: if_output MP-safe, etc. */
 	struct if_data	if_data;	/* ?: statistics and other data about if */
 	/*
 	 * Procedure handles.  If you add more of these, don't forget the
 	 * corresponding NULL stub in if.c.
 	 */
-	int	(*if_output)		/* output routine (enqueue) */
+	int		(*if_output)	/* :: output routine (enqueue) */
-		    (struct ifnet *, struct mbuf *, const struct sockaddr *,
+			    (struct ifnet *, struct mbuf *, const struct sockaddr *,
-		     const struct rtentry *);
+			     const struct rtentry *);
-	void	(*_if_input)		/* input routine (from h/w driver) */
+	void		(*_if_input)	/* :: input routine (from h/w driver) */
-		    (struct ifnet *, struct mbuf *);
+			    (struct ifnet *, struct mbuf *);
-	void	(*if_start)		/* initiate output routine */
+	void		(*if_start)	/* :: initiate output routine */
-		    (struct ifnet *);
+			    (struct ifnet *);
-	int	(*if_transmit)		/* output routine, must be MP-safe */
+	int		(*if_transmit)	/* :: output routine, must be MP-safe */
-		    (struct ifnet *, struct mbuf *);
+			    (struct ifnet *, struct mbuf *);
-	int	(*if_ioctl)		/* ioctl routine */
+	int		(*if_ioctl)	/* :: ioctl routine */
-		    (struct ifnet *, u_long, void *);
+			    (struct ifnet *, u_long, void *);
-	int	(*if_init)		/* init routine */
+	int		(*if_init)	/* :: init routine */
-		    (struct ifnet *);
+			    (struct ifnet *);
-	void	(*if_stop)		/* stop routine */
+	void		(*if_stop)	/* :: stop routine */
-		    (struct ifnet *, int);
+			    (struct ifnet *, int);
-	void	(*if_slowtimo)		/* timer routine */
+	void		(*if_slowtimo)	/* :: timer routine */
-		    (struct ifnet *);
+			    (struct ifnet *);
 #define	if_watchdog	if_slowtimo
-	void	(*if_drain)		/* routine to release resources */
+	void		(*if_drain)	/* :: routine to release resources */
-		    (struct ifnet *);
+			    (struct ifnet *);
-	struct ifaltq if_snd;		/* output queue (includes altq) */
+	struct ifaltq	if_snd;		/* q: output queue (includes altq) */
-	struct ifaddr	*if_dl;		/* identity of this interface. */
+	struct ifaddr	*if_dl;		/* i: identity of this interface. */
-	const struct	sockaddr_dl *if_sadl;	/* pointer to sockaddr_dl
+	const struct sockaddr_dl
-						 * of if_dl
+			*if_sadl;	/* i: pointer to sockaddr_dl of if_dl */
-						 */
+	/*
 	/* if_hwdl: h/w identity
 	 * May be NULL.  If not NULL, it is the address assigned
 	 * to the interface by the manufacturer, so it very likely
 	 * to be unique.  It MUST NOT be deleted.  It is highly
 	 * suitable for deriving the EUI64 for the interface.
 	 */
-	struct ifaddr	*if_hwdl;
+	struct ifaddr	*if_hwdl;	/* i: h/w identity */
-	const uint8_t *if_broadcastaddr;/* linklevel broadcast bytestring */
+	const uint8_t	*if_broadcastaddr;
-	struct bridge_softc	*if_bridge;	/* bridge glue */
+					/* :: linklevel broadcast bytestring */
-	struct bridge_iflist	*if_bridgeif;	/* shortcut to interface list entry */
+	struct bridge_softc
-	int	if_dlt;			/* data link type (<net/dlt.h>) */
+			*if_bridge;	/* i: bridge glue */
-	pfil_head_t *	if_pfil;	/* filtering point */
+	struct bridge_iflist
-	uint64_t if_capabilities;	/* interface capabilities */
+			*if_bridgeif;	/* i: shortcut to interface list entry */
-	uint64_t if_capenable;		/* capabilities enabled */
+	int		if_dlt;		/* :: data link type (<net/dlt.h>) */
 	pfil_head_t *	if_pfil;	/* :: filtering point */
 	uint64_t	if_capabilities;
 					/* i: interface capabilities */
 	uint64_t	if_capenable;	/* i: capabilities enabled */
 	union {
 		void *		carp_s;	/* carp structure (used by !carp ifs) */
 		struct ifnet	*carp_d;/* ptr to carpdev (used by carp ifs) */
-	} if_carp_ptr;
+	}		if_carp_ptr;	/* ?: */
 #define if_carp		if_carp_ptr.carp_s
 #define if_carpdev	if_carp_ptr.carp_d
 	/*
 	 * These are pre-computed based on an interfaces enabled
 	 * capabilities, for speed elsewhere.
 	 */
-	int	if_csum_flags_tx;	/* M_CSUM_* flags for Tx */
+	int		if_csum_flags_tx;
-	int	if_csum_flags_rx;	/* M_CSUM_* flags for Rx */
+					/* i: M_CSUM_* flags for Tx */
 	int		if_csum_flags_rx;
-	void	*if_afdata[AF_MAX];
+					/* i: M_CSUM_* flags for Rx */
 	struct	mowner *if_mowner;	/* who owns mbufs for this interface */
 	void		*if_afdata[AF_MAX];
 					/* a: */
 	struct mowner	*if_mowner;	/* ?: who owns mbufs for this interface */
-	void	*if_agrprivate;		/* used only when #if NAGR > 0 */
+	void		*if_agrprivate;	/* ?: used only when #if NAGR > 0 */
 	/*
 	 * pf specific data, used only when #if NPF > 0.
 	 */
-	void	*if_pf_kif;		/* pf interface abstraction */
+	void		*if_pf_kif;	/* ?: pf interface abstraction */
-	void	*if_pf_groups;		/* pf interface groups */
+	void		*if_pf_groups;	/* ?: pf interface groups */
 	/*
 	 * During an ifnet's lifetime, it has only one if_index, but
 	 * and if_index is not sufficient to identify an ifnet
 	 * because during the lifetime of the system, many ifnets may occupy a
 	 * given if_index.  Let us tell different ifnets at the same
 	 * if_index apart by their if_index_gen, a unique number that each ifnet
 	 * is assigned when it if_attach()s.  Now, the kernel can use the
 	 * pair (if_index, if_index_gen) as a weak reference to an ifnet.
 	 */
-	uint64_t if_index_gen;		/* generation number for the ifnet
+	uint64_t	if_index_gen;	/* :: generation number for the ifnet
 					 * at if_index: if two ifnets' index
 					 * and generation number are both the
 					 * same, they are the same ifnet.
 					 */
-	struct sysctllog	*if_sysctl_log;
+	struct sysctllog
-	int (*if_initaddr)(struct ifnet *, struct ifaddr *, bool);
+			*if_sysctl_log;	/* :: */
-	int (*if_mcastop)(struct ifnet *, const unsigned long,
+	int		(*if_initaddr)  /* :: */
-	    const struct sockaddr *);
+			    (struct ifnet *, struct ifaddr *, bool);
-	int (*if_setflags)(struct ifnet *, const short);
+	int		(*if_mcastop)	/* :: */
-	kmutex_t	*if_ioctl_lock;
+			    (struct ifnet *, const unsigned long,
 			    const struct sockaddr *);
 	int		(*if_setflags)	/* :: */
 			    (struct ifnet *, const short);
 	kmutex_t	*if_ioctl_lock;	/* :: */
 #ifdef _KERNEL /* XXX kvm(3) */
-	struct callout *if_slowtimo_ch;
+	struct callout	*if_slowtimo_ch;/* :: */
-	struct krwlock	*if_afdata_lock;
+	struct krwlock	*if_afdata_lock;/* :: */
-	struct if_percpuq	*if_percpuq; /* We should remove it in the future */
+	struct if_percpuq
-	void	*if_link_si;		/* softint to handle link state changes */
+			*if_percpuq;	/* :: we should remove it in the future */
-	uint16_t	if_link_queue;	/* masked link state change queue */
+	void		*if_link_si;	/* :: softint to handle link state changes */
-	struct pslist_entry	if_pslist_entry;
+	uint16_t	if_link_queue;	/* q: masked link state change queue */
-	struct psref_target     if_psref;
+	struct pslist_entry
-	struct pslist_head	if_addr_pslist;
+			if_pslist_entry;/* i: */
-	struct if_deferred_start	*if_deferred_start;
+	struct psref_target
 			if_psref;	/* :: */
 	struct pslist_head
 			if_addr_pslist;	/* i: */
 	struct if_deferred_start
 			*if_deferred_start;
 					/* :: */
 	/* XXX should be protocol independent */
-	LIST_HEAD(, in6_multi) if_multiaddrs;
+	LIST_HEAD(, in6_multi)
 			if_multiaddrs;	/* 6: */
 #endif
 } ifnet_t;
 #define	if_mtu		if_data.ifi_mtu
 #define	if_type		if_data.ifi_type
 #define	if_addrlen	if_data.ifi_addrlen
 #define	if_hdrlen	if_data.ifi_hdrlen
 #define	if_metric	if_data.ifi_metric
 #define	if_link_state	if_data.ifi_link_state
 #define	if_baudrate	if_data.ifi_baudrate
 #define	if_ipackets	if_data.ifi_ipackets
 #define	if_ierrors	if_data.ifi_ierrors
 #define	if_opackets	if_data.ifi_opackets
 @@ -377,81 +413,163 @@ typedef struct ifnet {
 #define	IFF_POINTOPOINT	0x0010		/* interface is point-to-point link */
 #define	IFF_NOTRAILERS	0x0020		/* avoid use of trailers */
 #define	IFF_RUNNING	0x0040		/* resources allocated */
 #define	IFF_NOARP	0x0080		/* no address resolution protocol */
 #define	IFF_PROMISC	0x0100		/* receive all packets */
 #define	IFF_ALLMULTI	0x0200		/* receive all multicast packets */
 #define	IFF_OACTIVE	0x0400		/* transmission in progress */
 #define	IFF_SIMPLEX	0x0800		/* can't hear own transmissions */
 #define	IFF_LINK0	0x1000		/* per link layer defined bit */
 #define	IFF_LINK1	0x2000		/* per link layer defined bit */
 #define	IFF_LINK2	0x4000		/* per link layer defined bit */
 #define	IFF_MULTICAST	0x8000		/* supports multicast */
-#define	IFEF_OUTPUT_MPSAFE		__BIT(0)	/* if_output() can run parallel */
+#define	IFEF_MPSAFE			__BIT(0)	/* handlers can run in parallel (see below) */
-#define	IFEF_START_MPSAFE		__BIT(1)	/* if_start() can run parallel */
+#define	IFEF_NO_LINK_STATE_CHANGE	__BIT(1)	/* doesn't use link state interrupts */
 #define	IFEF_NO_LINK_STATE_CHANGE	__BIT(2)	/* doesn't use link state interrupts */
 /*
  * The guidelines for converting an interface to IFEF_MPSAFE are as follows
+ *
  * Enabling IFEF_MPSAFE on an interface suppresses taking KERNEL_LOCK when
  * calling the following handlers:
  * - if_start
  *   - Note that if_transmit is always called without KERNEL_LOCK
  * - if_output
  * - if_ioctl
  * - if_init
  * - if_stop
+ *
  * This means that an interface with IFEF_MPSAFE must make the above handlers
  * MP-safe or take KERNEL_LOCK by itself inside handlers that aren't MP-safe
  * yet.
+ *
  * There are some additional restrictions to access member variables of struct
  * ifnet:
  * - if_flags
  *   - Must be updated with holding IFNET_LOCK
  *   - You cannot use the flag in Tx/Rx paths anymore because there is no
  *     synchronization on the flag except for IFNET_LOCK
  *   - Note that IFNET_LOCK can't be taken in softint because it's known
  *     that it causes a deadlock
  *     - Some synchronization mechanisms such as pserialize_perform are called
  *       with IFNET_LOCK and also require context switches on every CPUs
  *       that mean softints finish so trying to take IFNET_LOCK in softint
  *       might block on IFNET_LOCK and prevent such synchronization mechanisms
  *       from being completed
  *     - Currently the deadlock occurs only if NET_MPSAFE is enabled, however,
  *       we should deal with the restriction because NET_MPSAFE will be enabled
  *       by default in the future
  * - if_watchdog and if_timer
  *   - The watchdog framework works only for non-IFEF_MPSAFE interfaces
  *     that rely on KERNEL_LOCK
  *   - Interfaces with IFEF_MPSAFE have to provide its own watchdog mechanism
  *     if needed
  *     - Keep if_watchdog NULL when calling if_attach
  */
 #ifdef _KERNEL
 static inline bool
-if_output_is_mpsafe(struct ifnet *ifp)
+if_is_mpsafe(struct ifnet *ifp)
+{
-	return ((ifp->if_extflags & IFEF_OUTPUT_MPSAFE) != 0);
+	return ((ifp->if_extflags & IFEF_MPSAFE) != 0);
+}
 static inline int
 if_output_lock(struct ifnet *cifp, struct ifnet *ifp, struct mbuf *m,
     const struct sockaddr *dst, const struct rtentry *rt)
+{
-	if (if_output_is_mpsafe(cifp)) {
+	if (if_is_mpsafe(cifp)) {
 		return (*cifp->if_output)(ifp, m, dst, rt);
 	} else {
 		int ret;
 		KERNEL_LOCK(1, NULL);
 		ret = (*cifp->if_output)(ifp, m, dst, rt);
 		KERNEL_UNLOCK_ONE(NULL);
 		return ret;
+	}
+}
 static inline bool
 if_start_is_mpsafe(struct ifnet *ifp)
 	return ((ifp->if_extflags & IFEF_START_MPSAFE) != 0);
 static inline void
 if_start_lock(struct ifnet *ifp)
+{
-	if (if_start_is_mpsafe(ifp)) {
+	if (if_is_mpsafe(ifp)) {
 		(*ifp->if_start)(ifp);
 	} else {
 		KERNEL_LOCK(1, NULL);
 		(*ifp->if_start)(ifp);
 		KERNEL_UNLOCK_ONE(NULL);
+	}
+}
 static inline bool
 if_is_link_state_changeable(struct ifnet *ifp)
+{
 	return ((ifp->if_extflags & IFEF_NO_LINK_STATE_CHANGE) == 0);
+}
 #define KERNEL_LOCK_IF_IFP_MPSAFE(ifp)					\
 	do { if (if_is_mpsafe(ifp)) { KERNEL_LOCK(1, NULL); } } while (0)
 #define KERNEL_UNLOCK_IF_IFP_MPSAFE(ifp)				\
 	do { if (if_is_mpsafe(ifp)) { KERNEL_UNLOCK_ONE(NULL); } } while (0)
 #define KERNEL_LOCK_UNLESS_IFP_MPSAFE(ifp)				\
 	do { if (!if_is_mpsafe(ifp)) { KERNEL_LOCK(1, NULL); } } while (0)
 #define KERNEL_UNLOCK_UNLESS_IFP_MPSAFE(ifp)				\
 	do { if (!if_is_mpsafe(ifp)) { KERNEL_UNLOCK_ONE(NULL); } } while (0)
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 /* XXX explore a better place to define */
 #ifdef NET_MPSAFE
 #define KERNEL_LOCK_UNLESS_NET_MPSAFE()		do { } while (0)
 #define KERNEL_UNLOCK_UNLESS_NET_MPSAFE()	do { } while (0)
 #define SOFTNET_LOCK_UNLESS_NET_MPSAFE()	do { } while (0)
 #define SOFTNET_UNLOCK_UNLESS_NET_MPSAFE()	do { } while (0)
 #else /* NET_MPSAFE */
 #define KERNEL_LOCK_UNLESS_NET_MPSAFE()					\
 	do { KERNEL_LOCK(1, NULL); } while (0)
 #define KERNEL_UNLOCK_UNLESS_NET_MPSAFE()				\
 	do { KERNEL_UNLOCK_ONE(NULL); } while (0)
 #define SOFTNET_LOCK_UNLESS_NET_MPSAFE()				\
 	do { mutex_enter(softnet_lock); } while (0)
 #define SOFTNET_UNLOCK_UNLESS_NET_MPSAFE()				\
 	do { mutex_exit(softnet_lock); } while (0)
 #endif /* NET_MPSAFE */
 #define SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE()				\
 	do {								\
 		SOFTNET_LOCK_UNLESS_NET_MPSAFE();			\
 		KERNEL_LOCK_UNLESS_NET_MPSAFE();			\
 	} while (0)
 #define SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE()			\
 	do {								\
 		KERNEL_UNLOCK_UNLESS_NET_MPSAFE();			\
 		SOFTNET_UNLOCK_UNLESS_NET_MPSAFE();			\
 	} while (0)
 #endif /* _KERNEL */
 #define	IFFBITS \
     "\020\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\6NOTRAILERS" \
     "\7RUNNING\10NOARP\11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX" \
     "\15LINK0\16LINK1\17LINK2\20MULTICAST"
 /* flags set internally only: */
 #define	IFF_CANTCHANGE \
 	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE|\
 	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_PROMISC)
 /*
 @@ -946,44 +1064,47 @@ struct ifaddr *if_dl_create(const struct
 void if_activate_sadl(struct ifnet *, struct ifaddr *,
     const struct sockaddr_dl *);
 void	if_set_sadl(struct ifnet *, const void *, u_char, bool);
 void	if_alloc_sadl(struct ifnet *);
 int	if_initialize(struct ifnet *);
 void	if_register(struct ifnet *);
 int	if_attach(struct ifnet *); /* Deprecated. Use if_initialize and if_register */
 void	if_attachdomain(void);
 void	if_deactivate(struct ifnet *);
 bool	if_is_deactivated(const struct ifnet *);
 void	if_purgeaddrs(struct ifnet *, int, void (*)(struct ifaddr *));
 void	if_detach(struct ifnet *);
 void	if_down(struct ifnet *);
 void	if_down_locked(struct ifnet *);
 void	if_link_state_change(struct ifnet *, int);
 void	if_link_state_change_softint(struct ifnet *, int);
 void	if_up(struct ifnet *);
 void	ifinit(void);
 void	ifinit1(void);
 int	ifaddrpref_ioctl(struct socket *, u_long, void *, struct ifnet *);
 extern int (*ifioctl)(struct socket *, u_long, void *, struct lwp *);
 int	ifioctl_common(struct ifnet *, u_long, void *);
 int	ifpromisc(struct ifnet *, int);
 int	ifpromisc_locked(struct ifnet *, int);
 int	if_addr_init(ifnet_t *, struct ifaddr *, bool);
 int	if_do_dad(struct ifnet *);
 int	if_mcast_op(ifnet_t *, const unsigned long, const struct sockaddr *);
 int	if_flags_set(struct ifnet *, const short);
 int	if_clone_list(int, char *, int *);
 struct	ifnet *ifunit(const char *);
 struct	ifnet *if_get(const char *, struct psref *);
 ifnet_t *if_byindex(u_int);
 ifnet_t *_if_byindex(u_int);
 ifnet_t *if_get_byindex(u_int, struct psref *);
 ifnet_t *if_get_bylla(const void *, unsigned char, struct psref *);
 void	if_put(const struct ifnet *, struct psref *);
 void	if_acquire(struct ifnet *, struct psref *);
 #define	if_release	if_put
 static inline if_index_t
 if_get_index(const struct ifnet *ifp)
+{
 	return ifp != NULL ? ifp->if_index : 0;
+}
 @@ -1121,29 +1242,29 @@ __END_DECLS
 			IFADDR_WRITER_INSERT_HEAD((__ifp), (__new));	\
 		} else {						\
 			struct ifaddr *__ifa;				\
 			IFADDR_WRITER_FOREACH(__ifa, (__ifp)) {		\
 				if (IFADDR_WRITER_NEXT(__ifa) == NULL) {\
 					IFADDR_WRITER_INSERT_AFTER(__ifa,\
 					    (__new));			\
 					break;				\
 				}					\
 			}						\
 		}							\
 	} while (0)
-#define	IFNET_LOCK()			mutex_enter(&ifnet_mtx)
+#define	IFNET_GLOBAL_LOCK()			mutex_enter(&ifnet_mtx)
-#define	IFNET_UNLOCK()			mutex_exit(&ifnet_mtx)
+#define	IFNET_GLOBAL_UNLOCK()			mutex_exit(&ifnet_mtx)
-#define	IFNET_LOCKED()			mutex_owned(&ifnet_mtx)
+#define	IFNET_GLOBAL_LOCKED()			mutex_owned(&ifnet_mtx)
 #define IFNET_READER_EMPTY() \
 	(PSLIST_READER_FIRST(&ifnet_pslist, struct ifnet, if_pslist_entry) == NULL)
 #define IFNET_READER_FIRST() \
 	PSLIST_READER_FIRST(&ifnet_pslist, struct ifnet, if_pslist_entry)
 #define IFNET_READER_NEXT(__ifp) \
 	PSLIST_READER_NEXT((__ifp), struct ifnet, if_pslist_entry)
 #define IFNET_READER_FOREACH(__ifp) \
 	PSLIST_READER_FOREACH((__ifp), &ifnet_pslist, struct ifnet, \
 	                      if_pslist_entry)
 #define IFNET_WRITER_INSERT_HEAD(__ifp) \
 	PSLIST_WRITER_INSERT_HEAD(&ifnet_pslist, (__ifp), if_pslist_entry)
 #define IFNET_WRITER_REMOVE(__ifp) \
 @@ -1163,26 +1284,30 @@ __END_DECLS
 			IFNET_WRITER_INSERT_HEAD((__new));		\
 		} else {						\
 			struct ifnet *__ifp;				\
 			IFNET_WRITER_FOREACH(__ifp) {			\
 				if (IFNET_WRITER_NEXT(__ifp) == NULL) {	\
 					IFNET_WRITER_INSERT_AFTER(__ifp,\
 					    (__new));			\
 					break;				\
 				}					\
 			}						\
 		}							\
 	} while (0)
 #define IFNET_LOCK(ifp)		mutex_enter((ifp)->if_ioctl_lock)
 #define IFNET_UNLOCK(ifp)	mutex_exit((ifp)->if_ioctl_lock)
 #define IFNET_LOCKED(ifp)	mutex_owned((ifp)->if_ioctl_lock)
 extern struct pslist_head ifnet_pslist;
 extern kmutex_t ifnet_mtx;
 extern struct ifnet *lo0ifp;
 /*
  * ifq sysctl support
  */
 int	sysctl_ifq(int *name, u_int namelen, void *oldp,
 		       size_t *oldlenp, void *newp, size_t newlen,
 		       struct ifqueue *ifq);
 /* symbolic names for terminal (per-protocol) CTL_IFQ_ nodes */
 #define IFQCTL_LEN 1

--- src/sys/net/if_bridge.c 2017/12/10 10:10:24	1.134.6.4
+++ src/sys/net/if_bridge.c 2018/01/02 10:20:33	1.134.6.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bridge.c,v 1.134.6.4 2017/12/10 10:10:24 snj Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.134.6.5 2018/01/02 10:20:33 snj Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -70,27 +70,27 @@
 /*
  * Network interface bridge support.
+ *
  * TODO:
+ *
  *	- Currently only supports Ethernet-like interfaces (Ethernet,
  *	  802.11, VLANs on Ethernet, etc.)  Figure out a nice way
  *	  to bridge other types of interfaces (FDDI-FDDI, and maybe
  *	  consider heterogenous bridges).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.134.6.4 2017/12/10 10:10:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.134.6.5 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h> /* for softnet_lock */
 @@ -414,27 +414,30 @@ bridge_clone_create(struct if_clone *ifc
 	    bridge_rtage_work, sc, PRI_SOFTNET, IPL_SOFTNET, WQ_MPSAFE);
 	if (error)
 		panic("%s: workqueue_create %d\n", __func__, error);
 	callout_init(&sc->sc_brcallout, CALLOUT_MPSAFE);
 	callout_init(&sc->sc_bstpcallout, CALLOUT_MPSAFE);
 	mutex_init(&sc->sc_iflist_psref.bip_lock, MUTEX_DEFAULT, IPL_NONE);
 	PSLIST_INIT(&sc->sc_iflist_psref.bip_iflist);
 	sc->sc_iflist_psref.bip_psz = pserialize_create();
 	if_initname(ifp, ifc->ifc_name, unit);
 	ifp->if_softc = sc;
-	ifp->if_extflags = IFEF_OUTPUT_MPSAFE | IFEF_NO_LINK_STATE_CHANGE;
+	ifp->if_extflags = IFEF_NO_LINK_STATE_CHANGE;
 #ifdef NET_MPSAFE
 	ifp->if_extflags |= IFEF_MPSAFE;
 #endif
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_ioctl = bridge_ioctl;
 	ifp->if_output = bridge_output;
 	ifp->if_start = bridge_start;
 	ifp->if_stop = bridge_stop;
 	ifp->if_init = bridge_init;
 	ifp->if_type = IFT_BRIDGE;
 	ifp->if_addrlen = 0;
 	ifp->if_dlt = DLT_EN10MB;
 	ifp->if_hdrlen = ETHER_HDR_LEN;
 	error = if_initialize(ifp);
 	if (error != 0) {
 @@ -767,27 +770,30 @@ bridge_ioctl_add(struct bridge_softc *sc
 		goto out;
+	}
 	bif = kmem_alloc(sizeof(*bif), KM_SLEEP);
 	switch (ifs->if_type) {
 	case IFT_ETHER:
 		if (sc->sc_if.if_mtu != ifs->if_mtu) {
 			error = EINVAL;
 			goto out;
+		}
 		/* FALLTHROUGH */
 	case IFT_L2TP:
-		if ((error = ether_enable_vlan_mtu(ifs)) > 0)
+		IFNET_LOCK(ifs);
 		error = ether_enable_vlan_mtu(ifs);
 		IFNET_UNLOCK(ifs);
 		if (error > 0)
 			goto out;
 		/*
 		 * Place the interface into promiscuous mode.
 		 */
 		error = ifpromisc(ifs, 1);
 		if (error)
 			goto out;
 		break;
 	default:
 		error = EINVAL;
 		goto out;
+	}
 @@ -848,27 +854,29 @@ bridge_ioctl_del(struct bridge_softc *sc
 	bridge_delete_member(sc, bif);
 	BRIDGE_UNLOCK(sc);
 	switch (ifs->if_type) {
 	case IFT_ETHER:
 	case IFT_L2TP:
 		/*
 		 * Take the interface out of promiscuous mode.
 		 * Don't call it with holding a spin lock.
 		 */
 		(void) ifpromisc(ifs, 0);
 		IFNET_LOCK(ifs);
 		(void) ether_disable_vlan_mtu(ifs);
 		IFNET_UNLOCK(ifs);
 		break;
 	default:
 #ifdef DIAGNOSTIC
 		panic("bridge_delete_member: impossible");
 #endif
 		break;
+	}
 	bridge_rtdelete(sc, ifs);
 	if (sc->sc_if.if_flags & IFF_RUNNING)
 		bstp_initialization(sc);
 @@ -1322,56 +1330,52 @@ bridge_ifdetach(struct ifnet *ifp)
 	(void) bridge_ioctl_del(sc, &breq);
+}
 /*
  * bridge_init:
+ *
  *	Initialize a bridge interface.
  */
 static int
 bridge_init(struct ifnet *ifp)
+{
 	struct bridge_softc *sc = ifp->if_softc;
-	if (ifp->if_flags & IFF_RUNNING)
+	KASSERT((ifp->if_flags & IFF_RUNNING) == 0);
 		return 0;
 	callout_reset(&sc->sc_brcallout, bridge_rtable_prune_period * hz,
 	    bridge_timer, sc);
 	bstp_initialization(sc);
 	ifp->if_flags |= IFF_RUNNING;
 	bstp_initialization(sc);
 	return 0;
+}
 /*
  * bridge_stop:
+ *
  *	Stop the bridge interface.
  */
 static void
 bridge_stop(struct ifnet *ifp, int disable)
+{
 	struct bridge_softc *sc = ifp->if_softc;
-	if ((ifp->if_flags & IFF_RUNNING) == 0)
+	KASSERT((ifp->if_flags & IFF_RUNNING) != 0);
-		return;
+	ifp->if_flags &= ~IFF_RUNNING;
 	callout_stop(&sc->sc_brcallout);
 	bstp_stop(sc);
 	bridge_rtflush(sc, IFBF_FLUSHDYN);
 	ifp->if_flags &= ~IFF_RUNNING;
+}
 /*
  * bridge_enqueue:
+ *
  *	Enqueue a packet on a bridge member interface.
  */
 void
 bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m,
     int runfilt)
+{
 	int len, error;
 	short mflags;
 @@ -1435,27 +1439,27 @@ bridge_enqueue(struct bridge_softc *sc,
  */
 int
 bridge_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *sa,
     const struct rtentry *rt)
+{
 	struct ether_header *eh;
 	struct ifnet *dst_if;
 	struct bridge_softc *sc;
 	int s;
 	/*
 	 * bridge_output() is called from ether_output(), furthermore
 	 * ifp argument doesn't point to bridge(4). So, don't assert
-	 * IFEF_OUTPUT_MPSAFE here.
+	 * IFEF_MPSAFE here.
 	 */
 	if (m->m_len < ETHER_HDR_LEN) {
 		m = m_pullup(m, ETHER_HDR_LEN);
 		if (m == NULL)
 			return 0;
+	}
 	eh = mtod(m, struct ether_header *);
 	sc = ifp->if_bridge;
 	if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
 		if (memcmp(etherbroadcastaddr,

--- src/sys/net/Attic/if_etherip.c 2017/12/10 10:10:25	1.38.10.1
+++ src/sys/net/Attic/if_etherip.c 2018/01/02 10:20:33	1.38.10.2

 @@ -1,14 +1,14 @@
-/*      $NetBSD: if_etherip.c,v 1.38.10.1 2017/12/10 10:10:25 snj Exp $        */
+/*      $NetBSD: if_etherip.c,v 1.38.10.2 2018/01/02 10:20:33 snj Exp $        */
 /*
  *  Copyright (c) 2006, Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
  *  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.
 @@ -76,27 +76,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.38.10.1 2017/12/10 10:10:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_etherip.c,v 1.38.10.2 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 @@ -539,61 +539,61 @@ etherip_set_tunnel(struct ifnet *ifp,
 	ifp->if_flags &= ~IFF_RUNNING;
 	osrc = sc->sc_src; sc->sc_src = NULL;
 	odst = sc->sc_dst; sc->sc_dst = NULL;
 	sc->sc_src = sockaddr_dup(src, M_WAITOK);
 	if (osrc)
 		sockaddr_free(osrc);
 	sc->sc_dst = sockaddr_dup(dst, M_WAITOK);
 	if (odst)
 		sockaddr_free(odst);
 	ifp->if_flags |= IFF_RUNNING;
 	sc->sc_si = softint_establish(SOFTINT_NET, etheripintr, sc);
 	if (sc->sc_si == NULL)
 		error = ENOMEM;
 	ifp->if_flags |= IFF_RUNNING;
 out:
 	splx(s);
 	return(error);
+}
 static void
 etherip_delete_tunnel(struct ifnet *ifp)
+{
 	struct etherip_softc *sc = ifp->if_softc;
 	int s;
 	s = splsoftnet();
 	ifp->if_flags &= ~IFF_RUNNING;
 	if (sc->sc_si) {
 		softint_disestablish(sc->sc_si);
 		sc->sc_si = NULL;
+	}
 	if (sc->sc_src) {
 		sockaddr_free(sc->sc_src);
 		sc->sc_src = NULL;
+	}
 	if (sc->sc_dst) {
 		sockaddr_free(sc->sc_dst);
 		sc->sc_dst = NULL;
+	}
 	ifp->if_flags &= ~IFF_RUNNING;
 	splx(s);
+}
 static int
 etherip_init(struct ifnet *ifp)
+{
 	struct etherip_softc *sc = ifp->if_softc;
 	if (sc->sc_si == NULL)
 		sc->sc_si = softint_establish(SOFTINT_NET, etheripintr, sc);
 	if (sc->sc_si == NULL)
 		return(ENOMEM);

--- src/sys/net/if_ethersubr.c 2017/10/24 08:38:59	1.242.6.1
+++ src/sys/net/if_ethersubr.c 2018/01/02 10:20:33	1.242.6.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ethersubr.c,v 1.242.6.1 2017/10/24 08:38:59 snj Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.242.6.2 2018/01/02 10:20:33 snj Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
 @@ -51,27 +51,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_ethersubr.c	8.2 (Berkeley) 4/4/96
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.242.6.1 2017/10/24 08:38:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.242.6.2 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #include "opt_mbuftrace.h"
 #include "opt_mpls.h"
 #include "opt_gateway.h"
 #include "opt_pppoe.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include "vlan.h"
 #include "pppoe.h"
 @@ -194,33 +194,26 @@ ether_output(struct ifnet * const ifp0,
 	int error = 0, hdrcmplt = 0;
  	uint8_t esrc[6], edst[6];
 	struct mbuf *m = m0;
 	struct mbuf *mcopy = NULL;
 	struct ether_header *eh;
 	struct ifnet *ifp = ifp0;
 #ifdef INET
 	struct arphdr *ah;
 #endif /* INET */
 #ifdef NETATALK
 	struct at_ifaddr *aa;
 #endif /* NETATALK */
 	/*
 	 * some paths such as carp_output() call ethr_output() with "ifp"
 	 * argument as other than ether ifnet.
 	 */
 	KASSERT(ifp->if_output != ether_output
 	    || ifp->if_extflags & IFEF_OUTPUT_MPSAFE);
 #ifdef MBUFTRACE
 	m_claimm(m, ifp->if_mowner);
 #endif
 #if NCARP > 0
 	if (ifp->if_type == IFT_CARP) {
 		struct ifaddr *ifa;
 		int s = pserialize_read_enter();
 		/* loop back if this is going to the carp interface */
 		if (dst != NULL && ifp0->if_link_state == LINK_STATE_UP &&
 		    (ifa = ifa_ifwithaddr(dst)) != NULL) {
 			if (ifa->ifa_ifp == ifp0) {
 @@ -941,27 +934,26 @@ ether_snprintf(char *buf, size_t len, co
+	}
 	*--cp = '\0';
 	return buf;
+}
 /*
  * Perform common duties while attaching to interface list
  */
 void
 ether_ifattach(struct ifnet *ifp, const uint8_t *lla)
+{
 	struct ethercom *ec = (struct ethercom *)ifp;
 	ifp->if_extflags |= IFEF_OUTPUT_MPSAFE;
 	ifp->if_type = IFT_ETHER;
 	ifp->if_hdrlen = ETHER_HDR_LEN;
 	ifp->if_dlt = DLT_EN10MB;
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_output = ether_output;
 	ifp->_if_input = ether_input;
 	if (ifp->if_baudrate == 0)
 		ifp->if_baudrate = IF_Mbps(10);		/* just a default */
 	if (lla != NULL)
 		if_set_sadl(ifp, lla, ETHER_ADDR_LEN, !ETHER_IS_LOCAL(lla));
 	LIST_INIT(&ec->ec_multiaddrs);
 @@ -1003,27 +995,27 @@ ether_ifdetach(struct ifnet *ifp)
 		bridge_ifdetach(ifp);
 #endif
 	bpf_detach(ifp);
 #if NVLAN > 0
 	if (ec->ec_nvlans)
 		vlan_ifdetach(ifp);
 #endif
 	mutex_enter(ec->ec_lock);
 	while ((enm = LIST_FIRST(&ec->ec_multiaddrs)) != NULL) {
 		LIST_REMOVE(enm, enm_list);
-		kmem_free(enm, sizeof(*enm));
+		kmem_intr_free(enm, sizeof(*enm));
 		ec->ec_multicnt--;
+	}
 	mutex_exit(ec->ec_lock);
 	mutex_destroy(ec->ec_lock);
 	ifp->if_mowner = NULL;
 	MOWNER_DETACH(&ec->ec_rx_mowner);
 	MOWNER_DETACH(&ec->ec_tx_mowner);
+}
 #if 0
 /*
 @@ -1267,27 +1259,27 @@ ether_addmulti(const struct sockaddr *sa
 	memcpy(enm->enm_addrhi, addrhi, 6);
 	enm->enm_refcount = 1;
 	LIST_INSERT_HEAD(&ec->ec_multiaddrs, enm, enm_list);
 	ec->ec_multicnt++;
 	/*
 	 * Return ENETRESET to inform the driver that the list has changed
 	 * and its reception filter should be adjusted accordingly.
 	 */
 	error = ENETRESET;
 	enm = NULL;
 out:
 	mutex_exit(ec->ec_lock);
 	if (enm != NULL)
-		kmem_free(enm, sizeof(*enm));
+		kmem_intr_free(enm, sizeof(*enm));
 	return error;
+}
 /*
  * Delete a multicast address record.
  */
 int
 ether_delmulti(const struct sockaddr *sa, struct ethercom *ec)
+{
 	struct ether_multi *enm;
 	u_char addrlo[ETHER_ADDR_LEN];
 	u_char addrhi[ETHER_ADDR_LEN];
 	int error;
 @@ -1309,27 +1301,27 @@ ether_delmulti(const struct sockaddr *sa
 		/*
 		 * Still some claims to this record.
 		 */
 		error = 0;
 		goto error;
+	}
 	/*
 	 * No remaining claims to this record; unlink and free it.
 	 */
 	LIST_REMOVE(enm, enm_list);
 	ec->ec_multicnt--;
 	mutex_exit(ec->ec_lock);
-	kmem_free(enm, sizeof(*enm));
+	kmem_intr_free(enm, sizeof(*enm));
 	/*
 	 * Return ENETRESET to inform the driver that the list has changed
 	 * and its reception filter should be adjusted accordingly.
 	 */
 	return ENETRESET;
 error:
 	mutex_exit(ec->ec_lock);
 	return error;
+}
 void
 ether_set_ifflags_cb(struct ethercom *ec, ether_cb_t cb)
+{

--- src/sys/net/if_faith.c 2017/12/10 10:10:25	1.55.8.1
+++ src/sys/net/if_faith.c 2018/01/02 10:20:33	1.55.8.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_faith.c,v 1.55.8.1 2017/12/10 10:10:25 snj Exp $	*/
+/*	$NetBSD: if_faith.c,v 1.55.8.2 2018/01/02 10:20:33 snj Exp $	*/
 /*	$KAME: if_faith.c,v 1.21 2001/02/20 07:59:26 itojun Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  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
 @@ -30,27 +30,27 @@
  * SUCH DAMAGE.
  */
 /*
  * derived from
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
  * Id: if_loop.c,v 1.22 1996/06/19 16:24:10 wollman Exp
  */
 /*
  * IPv6-to-IPv4 TCP relay capturing interface
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.55.8.1 2017/12/10 10:10:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_faith.c,v 1.55.8.2 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 @@ -253,29 +253,29 @@ faithrtrequest(int cmd, struct rtentry *
  * Process an ioctl request.
  */
 /* ARGSUSED */
 static int
 faithioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct ifaddr *ifa;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int error = 0;
 	switch (cmd) {
 	case SIOCINITIFADDR:
 		ifp->if_flags |= IFF_UP | IFF_RUNNING;
 		ifa = (struct ifaddr *)data;
 		ifa->ifa_rtrequest = faithrtrequest;
 		ifp->if_flags |= IFF_UP | IFF_RUNNING;
 		/*
 		 * Everything else is done at a higher level.
 		 */
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		if (ifr == 0) {
 			error = EAFNOSUPPORT;		/* XXX */
 			break;
+		}
 		switch (ifr->ifr_addr.sa_family) {
 #ifdef INET

--- src/sys/net/if_gif.c 2017/12/21 19:14:41	1.126.2.5
+++ src/sys/net/if_gif.c 2018/01/02 10:20:33	1.126.2.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_gif.c,v 1.126.2.5 2017/12/21 19:14:41 snj Exp $	*/
+/*	$NetBSD: if_gif.c,v 1.126.2.6 2018/01/02 10:20:33 snj Exp $	*/
 /*	$KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -21,27 +21,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.126.2.5 2017/12/21 19:14:41 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.126.2.6 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
 @@ -265,27 +265,27 @@ gif_clone_create(struct if_clone *ifc, i
 static int
 gifattach0(struct gif_softc *sc)
+{
 	int rv;
 	sc->encap_cookie4 = sc->encap_cookie6 = NULL;
 	sc->gif_if.if_addrlen = 0;
 	sc->gif_if.if_mtu    = GIF_MTU;
 	sc->gif_if.if_flags  = IFF_POINTOPOINT | IFF_MULTICAST;
 	sc->gif_if.if_extflags  = IFEF_NO_LINK_STATE_CHANGE;
 #ifdef GIF_MPSAFE
-	sc->gif_if.if_extflags  |= IFEF_OUTPUT_MPSAFE;
+	sc->gif_if.if_extflags  |= IFEF_MPSAFE;
 #endif
 	sc->gif_if.if_ioctl  = gif_ioctl;
 	sc->gif_if.if_output = gif_output;
 	sc->gif_if.if_start = gif_start;
 	sc->gif_if.if_transmit = gif_transmit;
 	sc->gif_if.if_type   = IFT_GIF;
 	sc->gif_if.if_dlt    = DLT_NULL;
 	sc->gif_if.if_softc  = sc;
 	IFQ_SET_READY(&sc->gif_if.if_snd);
 	rv = if_initialize(&sc->gif_if);
 	if (rv != 0)
 		return rv;

--- src/sys/net/if_l2tp.c 2017/11/08 22:20:59	1.11.2.2
+++ src/sys/net/if_l2tp.c 2018/01/02 10:20:33	1.11.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_l2tp.c,v 1.11.2.2 2017/11/08 22:20:59 snj Exp $	*/
+/*	$NetBSD: if_l2tp.c,v 1.11.2.3 2018/01/02 10:20:33 snj Exp $	*/
 /*
  * Copyright (c) 2017 Internet Initiative Japan 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.
 @@ -21,30 +21,31 @@
  * 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.
  */
 /*
  * L2TPv3 kernel interface
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.11.2.2 2017/11/08 22:20:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.11.2.3 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
 @@ -251,28 +252,30 @@ l2tp_clone_create(struct if_clone *ifc,
 	LIST_INSERT_HEAD(&l2tp_softcs.list, sc, l2tp_list);
 	mutex_exit(&l2tp_softcs.lock);
 	return (0);
+}
 void
 l2tpattach0(struct l2tp_softc *sc)
+{
 	sc->l2tp_ec.ec_if.if_addrlen = 0;
 	sc->l2tp_ec.ec_if.if_mtu    = L2TP_MTU;
 	sc->l2tp_ec.ec_if.if_flags  = IFF_POINTOPOINT|IFF_MULTICAST|IFF_SIMPLEX;
-	sc->l2tp_ec.ec_if.if_extflags  = IFEF_OUTPUT_MPSAFE |
+	sc->l2tp_ec.ec_if.if_extflags = IFEF_NO_LINK_STATE_CHANGE;
-	    IFEF_START_MPSAFE | IFEF_NO_LINK_STATE_CHANGE;
+#ifdef NET_MPSAFE
 	sc->l2tp_ec.ec_if.if_extflags |= IFEF_MPSAFE;
 #endif
 	sc->l2tp_ec.ec_if.if_ioctl  = l2tp_ioctl;
 	sc->l2tp_ec.ec_if.if_output = l2tp_output;
 	sc->l2tp_ec.ec_if.if_type   = IFT_L2TP;
 	sc->l2tp_ec.ec_if.if_dlt    = DLT_NULL;
 	sc->l2tp_ec.ec_if.if_start  = l2tp_start;
 	sc->l2tp_ec.ec_if.if_transmit = l2tp_transmit;
 	sc->l2tp_ec.ec_if._if_input = ether_input;
 	IFQ_SET_READY(&sc->l2tp_ec.ec_if.if_snd);
 	if_attach(&sc->l2tp_ec.ec_if);
 	if_alloc_sadl(&sc->l2tp_ec.ec_if);
 	bpf_attach(&sc->l2tp_ec.ec_if, DLT_EN10MB, sizeof(struct ether_header));
+}

--- src/sys/net/if_loop.c 2017/12/10 10:10:25	1.94.6.3
+++ src/sys/net/if_loop.c 2018/01/02 10:20:33	1.94.6.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_loop.c,v 1.94.6.3 2017/12/10 10:10:25 snj Exp $	*/
+/*	$NetBSD: if_loop.c,v 1.94.6.4 2018/01/02 10:20:33 snj Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
 @@ -55,27 +55,27 @@
  * 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_loop.c	8.2 (Berkeley) 1/9/95
  */
 /*
  * Loopback interface driver for protocol testing and timing.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.94.6.3 2017/12/10 10:10:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.94.6.4 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #include "opt_mbuftrace.h"
 #include "opt_mpls.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 @@ -172,28 +172,30 @@ loopdetach(void)
+}
 static int
 loop_clone_create(struct if_clone *ifc, int unit)
+{
 	struct ifnet *ifp;
 	int rv;
 	ifp = if_alloc(IFT_LOOP);
 	if_initname(ifp, ifc->ifc_name, unit);
 	ifp->if_mtu = LOMTU;
-	ifp->if_flags = IFF_LOOPBACK | IFF_MULTICAST | IFF_RUNNING;
+	ifp->if_flags = IFF_LOOPBACK | IFF_MULTICAST;
-	ifp->if_extflags = IFEF_OUTPUT_MPSAFE;
+#ifdef NET_MPSAFE
 	ifp->if_extflags = IFEF_MPSAFE;
 #endif
 	ifp->if_ioctl = loioctl;
 	ifp->if_output = looutput;
 #ifdef ALTQ
 	ifp->if_start = lostart;
 #endif
 	ifp->if_type = IFT_LOOP;
 	ifp->if_hdrlen = 0;
 	ifp->if_addrlen = 0;
 	ifp->if_dlt = DLT_NULL;
 	IFQ_SET_READY(&ifp->if_snd);
 	if (unit == 0)
 		lo0ifp = ifp;
 	rv = if_attach(ifp);
 @@ -201,65 +203,67 @@ loop_clone_create(struct if_clone *ifc,
 		if_free(ifp);
 		return rv;
+	}
 	if_alloc_sadl(ifp);
 	bpf_attach(ifp, DLT_NULL, sizeof(u_int));
 #ifdef MBUFTRACE
 	ifp->if_mowner = malloc(sizeof(struct mowner), M_DEVBUF,
 	    M_WAITOK | M_ZERO);
 	strlcpy(ifp->if_mowner->mo_name, ifp->if_xname,
 	    sizeof(ifp->if_mowner->mo_name));
 	MOWNER_ATTACH(ifp->if_mowner);
 #endif
 	ifp->if_flags |= IFF_RUNNING;
 	return (0);
+}
 static int
 loop_clone_destroy(struct ifnet *ifp)
+{
 	if (ifp == lo0ifp)
 		return (EPERM);
 	ifp->if_flags &= ~IFF_RUNNING;
 #ifdef MBUFTRACE
 	MOWNER_DETACH(ifp->if_mowner);
 	free(ifp->if_mowner, M_DEVBUF);
 #endif
 	bpf_detach(ifp);
 	if_detach(ifp);
 	if_free(ifp);
 	return (0);
+}
 int
 looutput(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
     const struct rtentry *rt)
+{
 	pktqueue_t *pktq = NULL;
 	struct ifqueue *ifq = NULL;
 	int s, isr = -1;
 	int csum_flags;
 	int error = 0;
 	size_t pktlen;
 	MCLAIM(m, ifp->if_mowner);
-#ifndef NET_MPSAFE
+	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	KERNEL_LOCK(1, NULL);
 #endif
 	if ((m->m_flags & M_PKTHDR) == 0)
 		panic("looutput: no header mbuf");
 	if (ifp->if_flags & IFF_LOOPBACK)
 		bpf_mtap_af(ifp, dst->sa_family, m);
 	m_set_rcvif(m, ifp);
 	if (rt && rt->rt_flags & (RTF_REJECT|RTF_BLACKHOLE)) {
 		m_freem(m);
 		error = (rt->rt_flags & RTF_BLACKHOLE ? 0 :
 			rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH);
 		goto out;
+	}
 @@ -365,29 +369,27 @@ looutput(struct ifnet *ifp, struct mbuf
 	if (IF_QFULL(ifq)) {
 		IF_DROP(ifq);
 		m_freem(m);
 		splx(s);
 		error = ENOBUFS;
 		goto out;
+	}
 	ifp->if_ipackets++;
 	ifp->if_ibytes += m->m_pkthdr.len;
 	IF_ENQUEUE(ifq, m);
 	schednetisr(isr);
 	splx(s);
 out:
-#ifndef NET_MPSAFE
+	KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 #endif
 	return error;
+}
 #ifdef ALTQ
 static void
 lostart(struct ifnet *ifp)
+{
 	for (;;) {
 		pktqueue_t *pktq = NULL;
 		struct ifqueue *ifq = NULL;
 		struct mbuf *m;
 		size_t pktlen;
 		uint32_t af;

--- src/sys/net/if_media.c 2017/11/22 14:36:55	1.32.6.1
+++ src/sys/net/if_media.c 2018/01/02 10:20:33	1.32.6.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_media.c,v 1.32.6.1 2017/11/22 14:36:55 martin Exp $	*/
+/*	$NetBSD: if_media.c,v 1.32.6.2 2018/01/02 10:20:33 snj Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -66,27 +66,27 @@
 /*
  * BSD/OS-compatible network interface media selection.
+ *
  * Where it is safe to do so, this code strays slightly from the BSD/OS
  * design.  Software which uses the API (device drivers, basically)
  * shouldn't notice any difference.
+ *
  * Many thanks to Matt Thomas for providing the information necessary
  * to implement this interface.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.32.6.1 2017/11/22 14:36:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.32.6.2 2018/01/02 10:20:33 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/netisr.h>
 /*
 @@ -215,28 +215,28 @@ ifmedia_set(struct ifmedia *ifm, int tar
 #ifdef IFMEDIA_DEBUG
 	if (ifmedia_debug) {
 		printf("ifmedia_set: target ");
 		ifmedia_printword(target);
 		printf("ifmedia_set: setting to ");
 		ifmedia_printword(ifm->ifm_cur->ifm_media);
+	}
 #endif
+}
 /*
  * Device-independent media ioctl support function.
  */
-int
+static int
-ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm,
+_ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm,
     u_long cmd)
+{
 	struct ifmedia_entry *match;
 	struct ifmediareq *ifmr = (struct ifmediareq *) ifr;
 	int error = 0;
 #ifdef OSIOCSIFMEDIA
 	struct oifreq *oifr = (struct oifreq *)ifr;
 #endif
 	if (ifp == NULL || ifr == NULL || ifm == NULL)
 		return (EINVAL);
 	switch (cmd) {
 @@ -350,26 +350,42 @@ ifmedia_ioctl(struct ifnet *ifp, struct
 			free(kptr, M_TEMP);
+		}
 		ifmr->ifm_count = nwords;
 		break;
+	}
 	default:
 		return EINVAL;
+	}
 	return error;
+}
 int
 ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm,
     u_long cmd)
+{
 	int e;
 	/*
 	 * If if_is_mpsafe(ifp), KERNEL_LOCK isn't held here, but _ifmedia_ioctl
 	 * isn't MP-safe yet, so we must hold the lock.
 	 */
 	KERNEL_LOCK_IF_IFP_MPSAFE(ifp);
 	e = _ifmedia_ioctl(ifp, ifr, ifm, cmd);
 	KERNEL_UNLOCK_IF_IFP_MPSAFE(ifp);
 	return e;
+}
 /*
  * Find media entry matching a given ifm word.
  */
 struct ifmedia_entry *
 ifmedia_match(struct ifmedia *ifm, u_int target, u_int mask)
+{
 	struct ifmedia_entry *match, *next;
 	match = NULL;
 	mask = ~mask;
 	for (next = TAILQ_FIRST(&ifm->ifm_list); next != NULL;
 	     next = TAILQ_NEXT(next, ifm_list)) {

--- src/sys/net/if_pppoe.c 2017/12/10 10:10:25	1.125.6.4
+++ src/sys/net/if_pppoe.c 2018/01/02 10:20:33	1.125.6.5

 @@ -1,14 +1,14 @@
-/* $NetBSD: if_pppoe.c,v 1.125.6.4 2017/12/10 10:10:25 snj Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.125.6.5 2018/01/02 10:20:33 snj Exp $ */
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Husemann <martin@NetBSD.org>.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.125.6.4 2017/12/10 10:10:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.125.6.5 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
 #include "opt_pppoe.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -291,27 +291,27 @@ pppoedetach(void)
 static int
 pppoe_clone_create(struct if_clone *ifc, int unit)
+{
 	struct pppoe_softc *sc;
 	int rv;
 	sc = malloc(sizeof(struct pppoe_softc), M_DEVBUF, M_WAITOK|M_ZERO);
 	if_initname(&sc->sc_sppp.pp_if, "pppoe", unit);
 	sc->sc_sppp.pp_if.if_softc = sc;
 	sc->sc_sppp.pp_if.if_mtu = PPPOE_MAXMTU;
 	sc->sc_sppp.pp_if.if_flags = IFF_SIMPLEX|IFF_POINTOPOINT|IFF_MULTICAST;
 #ifdef PPPOE_MPSAFE
-	sc->sc_sppp.pp_if.if_extflags = IFEF_OUTPUT_MPSAFE;
+	sc->sc_sppp.pp_if.if_extflags = IFEF_MPSAFE;
 #endif
 	sc->sc_sppp.pp_if.if_type = IFT_PPP;
 	sc->sc_sppp.pp_if.if_hdrlen = sizeof(struct ether_header) + PPPOE_HEADERLEN;
 	sc->sc_sppp.pp_if.if_dlt = DLT_PPP_ETHER;
 	sc->sc_sppp.pp_flags |= PP_KEEPALIVE |	/* use LCP keepalive */
 				PP_NOFRAMING;	/* no serial encapsulation */
 	sc->sc_sppp.pp_if.if_ioctl = pppoe_ioctl;
 	IFQ_SET_MAXLEN(&sc->sc_sppp.pp_if.if_snd, IFQ_MAXLEN);
 	IFQ_SET_READY(&sc->sc_sppp.pp_if.if_snd);
 	/* changed to real address later */
 	memcpy(&sc->sc_dest, etherbroadcastaddr, sizeof(sc->sc_dest));
 @@ -465,54 +465,51 @@ static void
 pppoe_softintr_handler(void *dummy)
+{
 	/* called at splsoftnet() */
 	pppoeintr();
+}
 /* called at appropriate protection level */
 static void
 pppoeintr(void)
+{
 	struct mbuf *m;
 	int disc_done, data_done;
-#ifndef PPPOE_MPSAFE
+	SOFTNET_LOCK_UNLESS_NET_MPSAFE();
 		mutex_enter(softnet_lock);
 #endif
 	do {
 		disc_done = 0;
 		data_done = 0;
 		for (;;) {
 			IFQ_LOCK(&ppoediscinq);
 			IF_DEQUEUE(&ppoediscinq, m);
 			IFQ_UNLOCK(&ppoediscinq);
 			if (m == NULL) break;
 			disc_done = 1;
 			pppoe_disc_input(m);
+		}
 		for (;;) {
 			IFQ_LOCK(&ppoeinq);
 			IF_DEQUEUE(&ppoeinq, m);
 			IFQ_UNLOCK(&ppoeinq);
 			if (m == NULL) break;
 			data_done = 1;
 			pppoe_data_input(m);
+		}
 	} while (disc_done || data_done);
 #ifndef PPPOE_MPSAFE
-		mutex_exit(softnet_lock);
+	SOFTNET_UNLOCK_UNLESS_NET_MPSAFE();
 #endif
+}
 /* analyze and handle a single received packet while not in session state */
 static void
 pppoe_dispatch_disc_pkt(struct mbuf *m, int off)
+{
 	uint16_t tag, len;
 	uint16_t session, plen;
 	struct pppoe_softc *sc;
 	const char *err_msg;
 	char devname[IF_NAMESIZE];
 	char *error;
 	uint8_t *ac_cookie;

--- src/sys/net/if_spppsubr.c 2017/11/30 15:57:37	1.169.6.2
+++ src/sys/net/if_spppsubr.c 2018/01/02 10:20:33	1.169.6.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_spppsubr.c,v 1.169.6.2 2017/11/30 15:57:37 martin Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.169.6.3 2018/01/02 10:20:33 snj Exp $	 */
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
+ *
  * Copyright (C) 1994-1996 Cronyx Engineering Ltd.
  * Author: Serge Vakulenko, <vak@cronyx.ru>
+ *
  * Heavily revamped to conform to RFC 1661.
  * Copyright (C) 1997, Joerg Wunsch.
+ *
  * RFC2472 IPv6CP support.
  * Copyright (C) 2000, Jun-ichiro itojun Hagino <itojun@iijlab.net>.
 @@ -31,27 +31,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.
+ *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
+ *
  * From: if_spppsubr.c,v 1.39 1998/04/04 13:26:03 phk Exp
+ *
  * From: Id: if_spppsubr.c,v 1.23 1999/02/23 14:47:50 hm Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.169.6.2 2017/11/30 15:57:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.169.6.3 2018/01/02 10:20:33 snj Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_modular.h"
 #include "opt_compat_netbsd.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 @@ -5261,26 +5261,28 @@ sppp_get_ip_addrs(struct sppp *sp, uint3
 /*
  * Set IP addresses.  Must be called at splnet.
  * If an address is 0, leave it the way it is.
  */
 static void
 sppp_set_ip_addrs_work(struct work *wk, struct sppp *sp)
+{
 	STDDCL;
 	struct ifaddr *ifa;
 	struct sockaddr_in *si, *dest;
 	uint32_t myaddr = 0, hisaddr = 0;
 	int s;
 	IFNET_LOCK(ifp);
 	/*
 	 * Pick the first AF_INET address from the list,
 	 * aliases don't make any sense on a p2p link anyway.
 	 */
 	si = dest = NULL;
 	s = pserialize_read_enter();
 	IFADDR_READER_FOREACH(ifa, ifp) {
 		if (ifa->ifa_addr->sa_family == AF_INET) {
 			si = (struct sockaddr_in *)ifa->ifa_addr;
 			dest = (struct sockaddr_in *)ifa->ifa_dstaddr;
 			break;
+		}
+	}
 @@ -5324,26 +5326,28 @@ sppp_set_ip_addrs_work(struct work *wk,
 			pfil_run_addrhooks(if_pfil, SIOCAIFADDR, ifa);
+		}
+	}
 	if (ifp->if_mtu > sp->lcp.their_mru) {
 		sp->pp_saved_mtu = ifp->if_mtu;
 		ifp->if_mtu = sp->lcp.their_mru;
 		if (debug)
 			log(LOG_DEBUG,
 			    "%s: setting MTU to %" PRIu64 " bytes\n",
 			    ifp->if_xname, ifp->if_mtu);
+	}
 	IFNET_UNLOCK(ifp);
 	sppp_notify_con(sp);
+}
 static void
 sppp_set_ip_addrs(struct sppp *sp)
+{
 	struct ifnet *ifp = &sp->pp_if;
 	if (!pcq_put(sp->ipcp.update_addrs_q, (void *)IPCP_SET_ADDRS)) {
 		log(LOG_WARNING, "%s: cannot enqueued, ignore sppp_clear_ip_addrs\n",
 		    ifp->if_xname);
 		return;
+	}
 @@ -5355,26 +5359,28 @@ sppp_set_ip_addrs(struct sppp *sp)
+}
 /*
  * Clear IP addresses.  Must be called at splnet.
  */
 static void
 sppp_clear_ip_addrs_work(struct work *wk, struct sppp *sp)
+{
 	STDDCL;
 	struct ifaddr *ifa;
 	struct sockaddr_in *si, *dest;
 	int s;
 	IFNET_LOCK(ifp);
 	/*
 	 * Pick the first AF_INET address from the list,
 	 * aliases don't make any sense on a p2p link anyway.
 	 */
 	si = dest = NULL;
 	s = pserialize_read_enter();
 	IFADDR_READER_FOREACH(ifa, ifp) {
 		if (ifa->ifa_addr->sa_family == AF_INET) {
 			si = (struct sockaddr_in *)ifa->ifa_addr;
 			dest = (struct sockaddr_in *)ifa->ifa_dstaddr;
 			break;
+		}
+	}
 @@ -5404,26 +5410,28 @@ sppp_clear_ip_addrs_work(struct work *wk
 		if (!error) {
 			pfil_run_addrhooks(if_pfil, SIOCAIFADDR, ifa);
+		}
+	}
 	if (sp->pp_saved_mtu > 0) {
 		ifp->if_mtu = sp->pp_saved_mtu;
 		sp->pp_saved_mtu = 0;
 		if (debug)
 			log(LOG_DEBUG,
 			    "%s: resetting MTU to %" PRIu64 " bytes\n",
 			    ifp->if_xname, ifp->if_mtu);
+	}
 	IFNET_UNLOCK(ifp);
+}
 static void
 sppp_clear_ip_addrs(struct sppp *sp)
+{
 	struct ifnet *ifp = &sp->pp_if;
 	if (!pcq_put(sp->ipcp.update_addrs_q, (void *)IPCP_CLEAR_ADDRS)) {
 		log(LOG_WARNING, "%s: cannot enqueued, ignore sppp_clear_ip_addrs\n",
 		    ifp->if_xname);
 		return;
+	}
 @@ -5521,26 +5529,28 @@ sppp_gen_ip6_addr(struct sppp *sp, struc
 /*
  * Set my IPv6 address.  Must be called at splnet.
  */
 static void
 sppp_set_ip6_addr(struct sppp *sp, const struct in6_addr *src)
+{
 	STDDCL;
 	struct ifaddr *ifa;
 	struct sockaddr_in6 *sin6;
 	int s;
 	struct psref psref;
 	IFNET_LOCK(ifp);
 	/*
 	 * Pick the first link-local AF_INET6 address from the list,
 	 * aliases don't make any sense on a p2p link anyway.
 	 */
 	sin6 = NULL;
 	s = pserialize_read_enter();
 	IFADDR_READER_FOREACH(ifa, ifp)
+	{
 		if (ifa->ifa_addr->sa_family == AF_INET6)
+		{
 			sin6 = (struct sockaddr_in6 *)ifa->ifa_addr;
 			if (sin6 && IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
 @@ -5558,26 +5568,28 @@ sppp_set_ip6_addr(struct sppp *sp, const
 		memcpy(&new_sin6.sin6_addr, src, sizeof(new_sin6.sin6_addr));
 		error = in6_ifinit(ifp, ifatoia6(ifa), &new_sin6, 1);
 		if (debug && error)
+		{
 			log(LOG_DEBUG, "%s: %s: in6_ifinit failed, error=%d\n",
 			    ifp->if_xname, __func__, error);
+		}
 		if (!error) {
 			pfil_run_addrhooks(if_pfil, SIOCAIFADDR_IN6, ifa);
+		}
 		ifa_release(ifa, &psref);
+	}
 	IFNET_UNLOCK(ifp);
+}
 #endif
 /*
  * Suggest a candidate address to be used by peer.
  */
 static void
 sppp_suggest_ip6_addr(struct sppp *sp, struct in6_addr *suggest)
+{
 	struct in6_addr myaddr;
 	struct timeval tv;
 	sppp_get_ip6_addrs(sp, &myaddr, 0, 0);

--- src/sys/net/if_tun.c 2017/11/08 22:20:59	1.139.2.1
+++ src/sys/net/if_tun.c 2018/01/02 10:20:33	1.139.2.2

 @@ -1,35 +1,35 @@
-/*	$NetBSD: if_tun.c,v 1.139.2.1 2017/11/08 22:20:59 snj Exp $	*/
+/*	$NetBSD: if_tun.c,v 1.139.2.2 2018/01/02 10:20:33 snj Exp $	*/
 /*
  * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
  * Nottingham University 1987.
+ *
  * This source may be freely distributed, however I would be interested
  * in any changes that are made.
+ *
  * This driver takes packets off the IP i/f and hands them up to a
  * user process to have its wicked way with. This driver has its
  * roots in a similar driver written by Phil Cockcroft (formerly) at
  * UCL. This driver is based much more on read/write/poll mode of
  * operation though.
  */
 /*
  * tun - tunnel software network interface.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.139.2.1 2017/11/08 22:20:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.139.2.2 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 @@ -411,28 +411,26 @@ tunclose(dev_t dev, int flag, int mode,
+	}
 out_nolock:
 	return 0;
+}
 static void
 tun_enable(struct tun_softc *tp, const struct ifaddr *ifa)
+{
 	struct ifnet	*ifp = &tp->tun_if;
 	TUNDEBUG("%s: %s\n", __func__, ifp->if_xname);
 	mutex_enter(&tp->tun_lock);
 	ifp->if_flags |= IFF_UP | IFF_RUNNING;
 	tp->tun_flags &= ~(TUN_IASET|TUN_DSTADDR);
 	switch (ifa->ifa_addr->sa_family) {
 #ifdef INET
 	case AF_INET: {
 		struct sockaddr_in *sin;
 		sin = satosin(ifa->ifa_addr);
 		if (sin && sin->sin_addr.s_addr)
 			tp->tun_flags |= TUN_IASET;
 		if (ifp->if_flags & IFF_POINTOPOINT) {
 			sin = satosin(ifa->ifa_dstaddr);
 @@ -452,26 +450,27 @@ tun_enable(struct tun_softc *tp, const s
 		if (ifp->if_flags & IFF_POINTOPOINT) {
 			sin = satosin6(ifa->ifa_dstaddr);
 			if (sin && !IN6_IS_ADDR_UNSPECIFIED(&sin->sin6_addr))
 				tp->tun_flags |= TUN_DSTADDR;
 		} else
 			tp->tun_flags &= ~TUN_DSTADDR;
 		break;
+	    }
 #endif /* INET6 */
 	default:
 		break;
+	}
 	ifp->if_flags |= IFF_UP | IFF_RUNNING;
 	mutex_exit(&tp->tun_lock);
+}
 /*
  * Process an ioctl request.
  */
 static int
 tun_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct tun_softc *tp = (struct tun_softc *)(ifp->if_softc);
 	struct ifreq *ifr = (struct ifreq *)data;
 	struct ifaddr *ifa = (struct ifaddr *)data;
 	int error = 0;

--- src/sys/net/if_vlan.c 2017/12/10 10:10:25	1.97.2.10
+++ src/sys/net/if_vlan.c 2018/01/02 10:20:33	1.97.2.11

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_vlan.c,v 1.97.2.10 2017/12/10 10:10:25 snj Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.97.2.11 2018/01/02 10:20:33 snj Exp $	*/
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran, and by Jason R. Thorpe of Zembu Labs, Inc.
+ *
  * 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.
 @@ -68,30 +68,31 @@
  * enough of an Ethernet implementation to make ARP work.  The way we do
  * this is by telling everyone that we are an Ethernet interface, and then
  * catch the packets that ether_output() left on our output queue when it
  * calls if_start(), rewrite them for use by the real outgoing interface,
  * and ask it to send them.
+ *
  * TODO:
+ *
  *	- Need some way to notify vlan interfaces when the parent
  *	  interface changes MTU.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.10 2017/12/10 10:10:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.11 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kauth.h>
 #include <sys/mutex.h>
 @@ -235,26 +236,46 @@ static struct {
 	.lists = NULL,
 	.mask = 0,
 };
 pserialize_t vlan_psz __read_mostly;
 static struct psref_class *ifvm_psref_class __read_mostly;
 struct if_clone vlan_cloner =
     IF_CLONE_INITIALIZER("vlan", vlan_clone_create, vlan_clone_destroy);
 /* Used to pad ethernet frames with < ETHER_MIN_LEN bytes */
 static char vlan_zero_pad_buff[ETHER_MIN_LEN];
 static inline int
 vlan_safe_ifpromisc(struct ifnet *ifp, int pswitch)
+{
 	int e;
 	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	e = ifpromisc(ifp, pswitch);
 	KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	return e;
+}
 static inline int
 vlan_safe_ifpromisc_locked(struct ifnet *ifp, int pswitch)
+{
 	int e;
 	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	e = ifpromisc_locked(ifp, pswitch);
 	KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	return e;
+}
 void
 vlanattach(int n)
+{
 	/*
 	 * Nothing to do here, initialization is handled by the
 	 * module initialization code in vlaninit() below).
 	 */
+}
 static void
 vlaninit(void)
+{
 @@ -328,27 +349,30 @@ vlan_clone_create(struct if_clone *ifc,
 	mib->ifvm_p = NULL;
 	psref_target_init(&mib->ifvm_psref, ifvm_psref_class);
 	mutex_init(&ifv->ifv_lock, MUTEX_DEFAULT, IPL_NONE);
 	ifv->ifv_mib = mib;
 	mutex_enter(&ifv_list.lock);
 	LIST_INSERT_HEAD(&ifv_list.list, ifv, ifv_list);
 	mutex_exit(&ifv_list.lock);
 	if_initname(ifp, ifc->ifc_name, unit);
 	ifp->if_softc = ifv;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	ifp->if_extflags = IFEF_START_MPSAFE | IFEF_NO_LINK_STATE_CHANGE;
+	ifp->if_extflags = IFEF_NO_LINK_STATE_CHANGE;
 #ifdef NET_MPSAFE
 	ifp->if_extflags |= IFEF_MPSAFE;
 #endif
 	ifp->if_start = vlan_start;
 	ifp->if_transmit = vlan_transmit;
 	ifp->if_ioctl = vlan_ioctl;
 	IFQ_SET_READY(&ifp->if_snd);
 	rv = if_initialize(ifp);
 	if (rv != 0) {
 		aprint_error("%s: if_initialize failed(%d)\n", ifp->if_xname,
 		    rv);
 		goto fail;
+	}
 	vlan_reset_linkname(ifp);
 @@ -367,27 +391,29 @@ fail:
 	return rv;
+}
 static int
 vlan_clone_destroy(struct ifnet *ifp)
+{
 	struct ifvlan *ifv = ifp->if_softc;
 	mutex_enter(&ifv_list.lock);
 	LIST_REMOVE(ifv, ifv_list);
 	mutex_exit(&ifv_list.lock);
 	IFNET_LOCK(ifp);
 	vlan_unconfig(ifp);
 	IFNET_UNLOCK(ifp);
 	if_detach(ifp);
 	psref_target_destroy(&ifv->ifv_mib->ifvm_psref, ifvm_psref_class);
 	kmem_free(ifv->ifv_mib, sizeof(struct ifvlan_linkmib));
 	mutex_destroy(&ifv->ifv_lock);
 	free(ifv, M_DEVBUF);
 	return (0);
+}
 /*
  * Configure a VLAN interface.
  */
 @@ -427,27 +453,30 @@ vlan_config(struct ifvlan *ifv, struct i
 	nmib_psref = &nmib->ifvm_psref;
 	psref_target_init(nmib_psref, ifvm_psref_class);
 	switch (p->if_type) {
 	case IFT_ETHER:
+	    {
 		struct ethercom *ec = (void *) p;
 		nmib->ifvm_msw = &vlan_ether_multisw;
 		nmib->ifvm_encaplen = ETHER_VLAN_ENCAP_LEN;
 		nmib->ifvm_mintu = ETHERMIN;
 		if (ec->ec_nvlans++ == 0) {
-			if ((error = ether_enable_vlan_mtu(p)) >= 0) {
+			IFNET_LOCK(p);
 			error = ether_enable_vlan_mtu(p);
 			IFNET_UNLOCK(p);
 			if (error >= 0) {
 				if (error) {
 					ec->ec_nvlans--;
 					goto done;
+				}
 				nmib->ifvm_mtufudge = 0;
 			} else {
 				/*
 				 * Fudge the MTU by the encapsulation size. This
 				 * makes us incompatible with strictly compliant
 				 * 802.1Q implementations, but allows us to use
 				 * the feature with other NetBSD
 				 * implementations, which might still be useful.
 				 */
 @@ -524,72 +553,80 @@ done:
 	return error;
+}
 /*
  * Unconfigure a VLAN interface.
  */
 static void
 vlan_unconfig(struct ifnet *ifp)
+{
 	struct ifvlan *ifv = ifp->if_softc;
 	struct ifvlan_linkmib *nmib = NULL;
 	int error;
 	KASSERT(IFNET_LOCKED(ifp));
 	nmib = kmem_alloc(sizeof(*nmib), KM_SLEEP);
 	mutex_enter(&ifv->ifv_lock);
 	error = vlan_unconfig_locked(ifv, nmib);
 	mutex_exit(&ifv->ifv_lock);
 	if (error)
 		kmem_free(nmib, sizeof(*nmib));
+}
 static int
 vlan_unconfig_locked(struct ifvlan *ifv, struct ifvlan_linkmib *nmib)
+{
 	struct ifnet *p;
 	struct ifnet *ifp = &ifv->ifv_if;
 	struct psref_target *nmib_psref = NULL;
 	struct ifvlan_linkmib *omib;
 	int error = 0;
 	KASSERT(IFNET_LOCKED(ifp));
 	KASSERT(mutex_owned(&ifv->ifv_lock));
 	ifp->if_flags &= ~(IFF_UP|IFF_RUNNING);
 	omib = ifv->ifv_mib;
 	p = omib->ifvm_p;
 	if (p == NULL) {
 		error = -1;
 		goto done;
+	}
 	*nmib = *omib;
 	nmib_psref = &nmib->ifvm_psref;
 	psref_target_init(nmib_psref, ifvm_psref_class);
 	/*
  	 * Since the interface is being unconfigured, we need to empty the
 	 * list of multicast groups that we may have joined while we were
 	 * alive and remove them from the parent's list also.
 	 */
 	(*nmib->ifvm_msw->vmsw_purgemulti)(ifv);
 	/* Disconnect from parent. */
 	switch (p->if_type) {
 	case IFT_ETHER:
+	    {
 		struct ethercom *ec = (void *)p;
-		if (--ec->ec_nvlans == 0)
+		if (--ec->ec_nvlans == 0) {
-			(void)ether_disable_vlan_mtu(p);
+			IFNET_LOCK(p);
 			(void) ether_disable_vlan_mtu(p);
 			IFNET_UNLOCK(p);
+		}
 		ether_ifdetach(ifp);
 		/* Restore vlan_ioctl overwritten by ether_ifdetach */
 		ifp->if_ioctl = vlan_ioctl;
 		vlan_reset_linkname(ifp);
 		break;
+	    }
 #ifdef DIAGNOSTIC
 	default:
 		panic("vlan_unconfig: impossible");
 #endif
+	}
 @@ -602,35 +639,36 @@ vlan_unconfig_locked(struct ifvlan *ifv,
 	PSLIST_WRITER_REMOVE(ifv, ifv_hash);
 	pserialize_perform(vlan_psz);
 	mutex_exit(&ifv_hash.lock);
 	PSLIST_ENTRY_DESTROY(ifv, ifv_hash);
 	vlan_linkmib_update(ifv, nmib);
 	mutex_exit(&ifv->ifv_lock);
 	nmib_psref = NULL;
 	kmem_free(omib, sizeof(*omib));
 #ifdef INET6
 	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	/* To delete v6 link local addresses */
 	if (in6_present)
 		in6_ifdetach(ifp);
 	KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 #endif
 	if ((ifp->if_flags & IFF_PROMISC) != 0)
-		ifpromisc(ifp, 0);
+		vlan_safe_ifpromisc_locked(ifp, 0);
-	if_down(ifp);
+	if_down_locked(ifp);
 	ifp->if_flags &= ~(IFF_UP|IFF_RUNNING);
 	ifp->if_capabilities = 0;
 	mutex_enter(&ifv->ifv_lock);
 done:
 	if (nmib_psref)
 		psref_target_destroy(nmib_psref, ifvm_psref_class);
 	return error;
+}
 static void
 vlan_hash_init(void)
+{
 @@ -779,38 +817,43 @@ vlan_ifdetach(struct ifnet *p)
 	 * The value of "cnt" does not increase while ifv_list.lock
 	 * and ifv->ifv_lock are released here, because the parent
 	 * interface is detaching.
 	 */
 	nmibs = kmem_alloc(sizeof(*nmibs) * cnt, KM_SLEEP);
 	for (i=0; i < cnt; i++) {
 		nmibs[i] = kmem_alloc(sizeof(*nmibs[i]), KM_SLEEP);
+	}
 	mutex_enter(&ifv_list.lock);
 	i = 0;
 	LIST_FOREACH(ifv, &ifv_list.list, ifv_list) {
 		struct ifnet *ifp = &ifv->ifv_if;
 		/* Need IFNET_LOCK that must be held before ifv_lock. */
 		IFNET_LOCK(ifp);
 		mutex_enter(&ifv->ifv_lock);
 		if (ifv->ifv_mib->ifvm_p == p) {
 			KASSERTMSG(i < cnt, "no memory for unconfig, parent=%s",
 			    p->if_xname);
 			error = vlan_unconfig_locked(ifv, nmibs[i]);
 			if (!error) {
 				nmibs[i] = NULL;
 				i++;
+			}
+		}
 		mutex_exit(&ifv->ifv_lock);
 		IFNET_UNLOCK(ifp);
+	}
 	mutex_exit(&ifv_list.lock);
 	curlwp_bindx(bound);
 	for (i=0; i < cnt; i++) {
 		if (nmibs[i])
 			kmem_free(nmibs[i], sizeof(*nmibs[i]));
+	}
 	kmem_free(nmibs, sizeof(*nmibs) * cnt);
 	return;
 @@ -824,33 +867,33 @@ vlan_set_promisc(struct ifnet *ifp)
 	struct psref psref;
 	int error = 0;
 	int bound;
 	bound = curlwp_bind();
 	mib = vlan_getref_linkmib(ifv, &psref);
 	if (mib == NULL) {
 		curlwp_bindx(bound);
 		return EBUSY;
+	}
 	if ((ifp->if_flags & IFF_PROMISC) != 0) {
 		if ((ifv->ifv_flags & IFVF_PROMISC) == 0) {
-			error = ifpromisc(mib->ifvm_p, 1);
+			error = vlan_safe_ifpromisc(mib->ifvm_p, 1);
 			if (error == 0)
 				ifv->ifv_flags |= IFVF_PROMISC;
+		}
 	} else {
 		if ((ifv->ifv_flags & IFVF_PROMISC) != 0) {
-			error = ifpromisc(mib->ifvm_p, 0);
+			error = vlan_safe_ifpromisc(mib->ifvm_p, 0);
 			if (error == 0)
 				ifv->ifv_flags &= ~IFVF_PROMISC;
+		}
+	}
 	vlan_putref_linkmib(mib, &psref);
 	curlwp_bindx(bound);
 	return (error);
+}
 static int
 vlan_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 @@ -907,50 +950,51 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd
 			break;
 		if (vlr.vlr_parent[0] == '\0') {
 			bound = curlwp_bind();
 			mib = vlan_getref_linkmib(ifv, &psref);
 			if (mib == NULL) {
 				curlwp_bindx(bound);
 				error = EBUSY;
 				break;
+			}
 			if (mib->ifvm_p != NULL &&
 			    (ifp->if_flags & IFF_PROMISC) != 0)
-				error = ifpromisc(mib->ifvm_p, 0);
+				error = vlan_safe_ifpromisc(mib->ifvm_p, 0);
 			vlan_putref_linkmib(mib, &psref);
 			curlwp_bindx(bound);
 			vlan_unconfig(ifp);
 			break;
+		}
 		if (vlr.vlr_tag != EVL_VLANOFTAG(vlr.vlr_tag)) {
 			error = EINVAL;		 /* check for valid tag */
 			break;
+		}
 		if ((pr = ifunit(vlr.vlr_parent)) == NULL) {
 			error = ENOENT;
 			break;
+		}
 		error = vlan_config(ifv, pr, vlr.vlr_tag);
 		if (error != 0) {
 			break;
+		}
 		ifp->if_flags |= IFF_RUNNING;
 		/* Update promiscuous mode, if necessary. */
 		vlan_set_promisc(ifp);
 		ifp->if_flags |= IFF_RUNNING;
 		break;
 	case SIOCGETVLAN:
 		memset(&vlr, 0, sizeof(vlr));
 		bound = curlwp_bind();
 		mib = vlan_getref_linkmib(ifv, &psref);
 		if (mib == NULL) {
 			curlwp_bindx(bound);
 			error = EBUSY;
 			break;
+		}
 		if (mib->ifvm_p != NULL) {
 			snprintf(vlr.vlr_parent, sizeof(vlr.vlr_parent), "%s",
 @@ -1104,27 +1148,32 @@ vlan_ether_addmulti(struct ifvlan *ifv,
 		goto alloc_failed;
+	}
 	/*
 	 * As ether_addmulti() returns ENETRESET, following two
 	 * statement shouldn't fail.
 	 */
 	(void)ether_multiaddr(sa, addrlo, addrhi);
 	ETHER_LOOKUP_MULTI(addrlo, addrhi, &ifv->ifv_ec, mc->mc_enm);
 	memcpy(&mc->mc_addr, sa, sa->sa_len);
 	LIST_INSERT_HEAD(&ifv->ifv_mc_listhead, mc, mc_entries);
 	mib = ifv->ifv_mib;
 	KERNEL_LOCK_UNLESS_IFP_MPSAFE(mib->ifvm_p);
 	IFNET_LOCK(mib->ifvm_p);
 	error = if_mcast_op(mib->ifvm_p, SIOCADDMULTI, sa);
 	IFNET_UNLOCK(mib->ifvm_p);
 	KERNEL_UNLOCK_UNLESS_IFP_MPSAFE(mib->ifvm_p);
 	if (error != 0)
 		goto ioctl_failed;
 	return (error);
  ioctl_failed:
 	LIST_REMOVE(mc, mc_entries);
 	free(mc, M_DEVBUF);
  alloc_failed:
 	(void)ether_delmulti(sa, &ifv->ifv_ec);
 	return (error);
+}
 @@ -1144,27 +1193,29 @@ vlan_ether_delmulti(struct ifvlan *ifv,
 	 * Find a key to lookup vlan_mc_entry.  We have to do this
 	 * before calling ether_delmulti for obvious reason.
 	 */
 	if ((error = ether_multiaddr(sa, addrlo, addrhi)) != 0)
 		return (error);
 	ETHER_LOOKUP_MULTI(addrlo, addrhi, &ifv->ifv_ec, enm);
 	error = ether_delmulti(sa, &ifv->ifv_ec);
 	if (error != ENETRESET)
 		return (error);
 	/* We no longer use this multicast address.  Tell parent so. */
 	mib = ifv->ifv_mib;
 	IFNET_LOCK(mib->ifvm_p);
 	error = if_mcast_op(mib->ifvm_p, SIOCDELMULTI, sa);
 	IFNET_UNLOCK(mib->ifvm_p);
 	if (error == 0) {
 		/* And forget about this address. */
 		for (mc = LIST_FIRST(&ifv->ifv_mc_listhead); mc != NULL;
 		    mc = LIST_NEXT(mc, mc_entries)) {
 			if (mc->mc_enm == enm) {
 				LIST_REMOVE(mc, mc_entries);
 				free(mc, M_DEVBUF);
 				break;
+			}
+		}
 		KASSERT(mc != NULL);
 	} else
 @@ -1179,28 +1230,30 @@ vlan_ether_delmulti(struct ifvlan *ifv,
 static void
 vlan_ether_purgemulti(struct ifvlan *ifv)
+{
 	struct vlan_mc_entry *mc;
 	struct ifvlan_linkmib *mib;
 	KASSERT(mutex_owned(&ifv->ifv_lock));
 	mib = ifv->ifv_mib;
 	if (mib == NULL) {
 		return;
+	}
 	while ((mc = LIST_FIRST(&ifv->ifv_mc_listhead)) != NULL) {
 		IFNET_LOCK(mib->ifvm_p);
 		(void)if_mcast_op(mib->ifvm_p, SIOCDELMULTI,
 		    (const struct sockaddr *)&mc->mc_addr);
 		IFNET_UNLOCK(mib->ifvm_p);
 		LIST_REMOVE(mc, mc_entries);
 		free(mc, M_DEVBUF);
+	}
+}
 static void
 vlan_start(struct ifnet *ifp)
+{
 	struct ifvlan *ifv = ifp->if_softc;
 	struct ifnet *p;
 	struct ethercom *ec;
 	struct mbuf *m;
 	struct ifvlan_linkmib *mib;

--- src/sys/net/rtsock.c 2017/10/21 19:43:54	1.213.2.3
+++ src/sys/net/rtsock.c 2018/01/02 10:20:33	1.213.2.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtsock.c,v 1.213.2.3 2017/10/21 19:43:54 snj Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.213.2.4 2018/01/02 10:20:33 snj Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
 @@ -51,27 +51,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.
+ *
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.213.2.3 2017/10/21 19:43:54 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.213.2.4 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_mpls.h"
 #include "opt_compat_netbsd.h"
 #include "opt_sctp.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 @@ -2028,49 +2028,43 @@ again:
 	return error;
+}
 /*
  * Routing message software interrupt routine
  */
 static void
 COMPATNAME(route_intr)(void *cookie)
+{
 	struct sockproto proto = { .sp_family = PF_XROUTE, };
 	struct route_info * const ri = &COMPATNAME(route_info);
 	struct mbuf *m;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	for (;;) {
 		IFQ_LOCK(&ri->ri_intrq);
 		IF_DEQUEUE(&ri->ri_intrq, m);
 		IFQ_UNLOCK(&ri->ri_intrq);
 		if (m == NULL)
 			break;
 		proto.sp_protocol = M_GETCTX(m, uintptr_t);
 #ifdef NET_MPSAFE
 		mutex_enter(rt_so_mtx);
 #endif
 		raw_input(m, &proto, &ri->ri_src, &ri->ri_dst, &rt_rawcb);
 #ifdef NET_MPSAFE
 		mutex_exit(rt_so_mtx);
 #endif
+	}
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 /*
  * Enqueue a message to the software interrupt routine.
  */
 void
 COMPATNAME(route_enqueue)(struct mbuf *m, int family)
+{
 	struct route_info * const ri = &COMPATNAME(route_info);
 	int wasempty;
 	IFQ_LOCK(&ri->ri_intrq);
 	if (IF_QFULL(&ri->ri_intrq)) {

--- src/sys/net/agr/if_agr.c 2017/01/28 22:56:09	1.41
+++ src/sys/net/agr/if_agr.c 2018/01/02 10:20:33	1.41.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_agr.c,v 1.41 2017/01/28 22:56:09 maya Exp $	*/
+/*	$NetBSD: if_agr.c,v 1.41.6.1 2018/01/02 10:20:33 snj Exp $	*/
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
  * 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.
 @@ -17,27 +17,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.41 2017/01/28 22:56:09 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_agr.c,v 1.41.6.1 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/sockio.h>
 @@ -693,42 +693,42 @@ agr_addport(struct ifnet *ifp, struct if
 	port->port_ioctl = ifp_port->if_ioctl;
 	ifp_port->if_ioctl = agr_ioctl_filter;
 	port->port_flags |= AGRPORT_ATTACHED;
 	AGR_UNLOCK(sc);
 	error = (*sc->sc_iftop->iftop_portinit)(sc, port);
 	if (error) {
 		printf("%s: portinit error %d\n", __func__, error);
 		goto cleanup;
+	}
 	ifp->if_flags |= IFF_RUNNING;
 	agrport_config_promisc(port, (ifp->if_flags & IFF_PROMISC) != 0);
 	error = (*sc->sc_iftop->iftop_configmulti_port)(sc, port, true);
 	if (error) {
 		printf("%s: configmulti error %d\n", __func__, error);
 		goto cleanup;
+	}
 	AGR_LOCK(sc);
 	port->port_flags &= ~AGRPORT_LARVAL;
 	AGR_UNLOCK(sc);
 out:
 	if (error && port) {
 		free(port, M_DEVBUF);
+	}
 	if (error == 0)
 		ifp->if_flags |= IFF_RUNNING;
 	return error;
 cleanup:
 	if (agrport_cleanup(sc, port)) {
 		printf("%s: error on cleanup\n", __func__);
 		port = NULL; /* XXX */
+	}
 	if (sc->sc_nports == 0) {
 		KASSERT(TAILQ_EMPTY(&sc->sc_ports));
 		agrtimer_stop(sc);
 		(*sc->sc_iftop->iftop_dtor)(sc);

--- src/sys/net/npf/npf_ifaddr.c 2017/01/03 00:58:05	1.2
+++ src/sys/net/npf/npf_ifaddr.c 2018/01/02 10:20:33	1.2.12.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: npf_ifaddr.c,v 1.2 2017/01/03 00:58:05 rmind Exp $	*/
+/*	$NetBSD: npf_ifaddr.c,v 1.2.12.1 2018/01/02 10:20:33 snj Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Mindaugas Rasiukevicius.
+ *
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * NPF network interface handling module.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ifaddr.c,v 1.2 2017/01/03 00:58:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ifaddr.c,v 1.2.12.1 2018/01/02 10:20:33 snj Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/kmem.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
 #include "npf_impl.h"
 static npf_table_t *
 lookup_ifnet_table(npf_t *npf, ifnet_t *ifp)
 @@ -160,22 +160,22 @@ npf_ifaddr_flush(npf_t *npf, ifnet_t *if
 	t = lookup_ifnet_table(npf, ifp);
 	if (!t) {
 		return;
+	}
 	replace_ifnet_table(npf, t);
+}
 void
 npf_ifaddr_syncall(npf_t *npf)
+{
 	ifnet_t *ifp;
 	KERNEL_LOCK(1, NULL);
-	IFNET_LOCK();
+	IFNET_GLOBAL_LOCK();
 	IFNET_WRITER_FOREACH(ifp) {
 		npf_ifaddr_sync(npf, ifp);
+	}
-	IFNET_UNLOCK();
+	IFNET_GLOBAL_UNLOCK();
 	KERNEL_UNLOCK_ONE(NULL);
+}

--- src/sys/net/npf/npf_os.c 2017/07/25 02:17:16	1.6.8.1
+++ src/sys/net/npf/npf_os.c 2018/01/02 10:20:33	1.6.8.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: npf_os.c,v 1.6.8.1 2017/07/25 02:17:16 snj Exp $	*/
+/*	$NetBSD: npf_os.c,v 1.6.8.2 2018/01/02 10:20:33 snj Exp $	*/
 /*-
  * Copyright (c) 2009-2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This material is based upon work partially supported by The
  * NetBSD Foundation under a contract with Mindaugas Rasiukevicius.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * NPF main: dynamic load/initialisation and unload routines.
  */
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.6.8.1 2017/07/25 02:17:16 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.6.8.2 2018/01/02 10:20:33 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "pf.h"
 #if NPF > 0
 #error "NPF and PF are mutually exclusive; please select one"
 #endif
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 @@ -303,31 +303,31 @@ npf_ifop_getname(ifnet_t *ifp)
 static ifnet_t *
 npf_ifop_lookup(const char *name)
+{
 	return ifunit(name);
+}
 static void
 npf_ifop_flush(void *arg)
+{
 	ifnet_t *ifp;
 	KERNEL_LOCK(1, NULL);
-	IFNET_LOCK();
+	IFNET_GLOBAL_LOCK();
 	IFNET_WRITER_FOREACH(ifp) {
 		ifp->if_pf_kif = arg;
+	}
-	IFNET_UNLOCK();
+	IFNET_GLOBAL_UNLOCK();
 	KERNEL_UNLOCK_ONE(NULL);
+}
 static void *
 npf_ifop_getmeta(const ifnet_t *ifp)
+{
 	return ifp->if_pf_kif;
+}
 static void
 npf_ifop_setmeta(ifnet_t *ifp, void *arg)
+{
 	ifp->if_pf_kif = arg;
 @@ -387,30 +387,27 @@ npf_ifaddrhook(void *arg, u_long cmd, vo
+	}
 	npf_ifaddr_sync(npf, ifa->ifa_ifp);
+}
 /*
  * npf_pfil_register: register pfil(9) hooks.
  */
 int
 npf_pfil_register(bool init)
+{
 	npf_t *npf = npf_getkernctx();
 	int error = 0;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	/* Init: interface re-config and attach/detach hook. */
 	if (!npf_ph_if) {
 		npf_ph_if = pfil_head_get(PFIL_TYPE_IFNET, 0);
 		if (!npf_ph_if) {
 			error = ENOENT;
 			goto out;
+		}
 		error = pfil_add_ihook(npf_ifhook, NULL,
 		    PFIL_IFNET, npf_ph_if);
 		KASSERT(error == 0);
 @@ -445,62 +442,53 @@ npf_pfil_register(bool init)
 	if (npf_ph_inet6) {
 		error = pfil_add_hook(npfkern_packet_handler, npf,
 		    PFIL_ALL, npf_ph_inet6);
 		KASSERT(error == 0);
+	}
 	/*
 	 * It is necessary to re-sync all/any interface address tables,
 	 * since we did not listen for any changes.
 	 */
 	npf_ifaddr_syncall(npf);
 	pfil_registered = true;
 out:
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
 	return error;
+}
 /*
  * npf_pfil_unregister: unregister pfil(9) hooks.
  */
 void
 npf_pfil_unregister(bool fini)
+{
 	npf_t *npf = npf_getkernctx();
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	if (fini && npf_ph_if) {
 		(void)pfil_remove_ihook(npf_ifhook, NULL,
 		    PFIL_IFNET, npf_ph_if);
 		(void)pfil_remove_ihook(npf_ifaddrhook, NULL,
 		    PFIL_IFADDR, npf_ph_if);
+	}
 	if (npf_ph_inet) {
 		(void)pfil_remove_hook(npfkern_packet_handler, npf,
 		    PFIL_ALL, npf_ph_inet);
+	}
 	if (npf_ph_inet6) {
 		(void)pfil_remove_hook(npfkern_packet_handler, npf,
 		    PFIL_ALL, npf_ph_inet6);
+	}
 	pfil_registered = false;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 bool
 npf_pfil_registered_p(void)
+{
 	return pfil_registered;
+}
 #endif

--- src/sys/netcan/if_canloop.c 2017/05/27 21:02:56	1.2
+++ src/sys/netcan/if_canloop.c 2018/01/02 10:20:34	1.2.2.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_canloop.c,v 1.2 2017/05/27 21:02:56 bouyer Exp $	*/
+/*	$NetBSD: if_canloop.c,v 1.2.2.1 2018/01/02 10:20:34 snj Exp $	*/
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * Loopback interface driver for the CAN protocol
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_canloop.c,v 1.2 2017/05/27 21:02:56 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_canloop.c,v 1.2.2.1 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_can.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 @@ -101,47 +101,52 @@ canloopdetach(void)
 	if_clone_detach(&canloop_cloner);
 	return 0;
+}
 static int
 canloop_clone_create(struct if_clone *ifc, int unit)
+{
 	struct ifnet *ifp;
 	ifp = if_alloc(IFT_OTHER);
 	if_initname(ifp, ifc->ifc_name, unit);
-	ifp->if_flags = IFF_LOOPBACK | IFF_RUNNING;
+	ifp->if_flags = IFF_LOOPBACK;
-	ifp->if_extflags = IFEF_OUTPUT_MPSAFE;
+#ifdef NET_MPSAFE
 	ifp->if_extflags = IFEF_MPSAFE;
 #endif
 	ifp->if_ioctl = canloop_ioctl;
 	ifp->if_start = canloop_ifstart;
 	can_ifattach(ifp);
 #ifdef MBUFTRACE
 	ifp->if_mowner = malloc(sizeof(struct mowner), M_DEVBUF,
 	    M_WAITOK | M_ZERO);
 	strlcpy(ifp->if_mowner->mo_name, ifp->if_xname,
 	    sizeof(ifp->if_mowner->mo_name));
 	MOWNER_ATTACH(ifp->if_mowner);
 #endif
 	canloop_count++;
 	ifp->if_flags |= IFF_RUNNING;
 	return (0);
+}
 static int
 canloop_clone_destroy(struct ifnet *ifp)
+{
 	ifp->if_flags &= ~IFF_RUNNING;
 #ifdef MBUFTRACE
 	MOWNER_DETACH(ifp->if_mowner);
 	free(ifp->if_mowner, M_DEVBUF);
 #endif
 	can_ifdetach(ifp);
 	if_free(ifp);
 	canloop_count--;
 	KASSERT(canloop_count >= 0);
 	return (0);
+}

--- src/sys/netinet/if_arp.c 2017/11/17 20:24:05	1.250.2.3
+++ src/sys/netinet/if_arp.c 2018/01/02 10:20:34	1.250.2.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_arp.c,v 1.250.2.3 2017/11/17 20:24:05 snj Exp $	*/
+/*	$NetBSD: if_arp.c,v 1.250.2.4 2018/01/02 10:20:34 snj Exp $	*/
 /*-
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Public Access Networks Corporation ("Panix").  It was developed under
  * contract to Panix by Eric Haszlakiewicz and Thor Lancelot Simon.
+ *
  * 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
 @@ -58,27 +58,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)if_ether.c	8.2 (Berkeley) 9/26/94
  */
 /*
  * Ethernet address resolution protocol.
  * TODO:
  *	add "inuse/lock" bit (or ref. count) along with valid bit
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.250.2.3 2017/11/17 20:24:05 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.250.2.4 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #ifdef INET
 #include "arp.h"
 #include "bridge.h"
 #include <sys/param.h>
 @@ -910,30 +910,27 @@ bad:
 /*
  * Common length and type checks are done here,
  * then the protocol-specific routine is called.
  */
 void
 arpintr(void)
+{
 	struct mbuf *m;
 	struct arphdr *ar;
 	int s;
 	int arplen;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	for (;;) {
 		struct ifnet *rcvif;
 		IFQ_LOCK(&arpintrq);
 		IF_DEQUEUE(&arpintrq, m);
 		IFQ_UNLOCK(&arpintrq);
 		if (m == NULL)
 			goto out;
 		if ((m->m_flags & M_PKTHDR) == 0)
 			panic("arpintr");
 		MCLAIM(m, &arpdomain.dom_mowner);
 		ARP_STATINC(ARP_STAT_RCVTOTAL);
 @@ -970,32 +967,28 @@ arpintr(void)
 				in_arpinput(m);
 				continue;
 			default:
 				ARP_STATINC(ARP_STAT_RCVBADPROTO);
+			}
 		else {
 badlen:
 			ARP_STATINC(ARP_STAT_RCVBADLEN);
+		}
 free:
 		m_freem(m);
+	}
 out:
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #else
 	return; /* XXX gcc */
 #endif
+}
 /*
  * ARP for Internet protocols on 10 Mb/s Ethernet. Algorithm is that given in
  * RFC 826. In addition, a sanity check is performed on the sender protocol
  * address, to catch impersonators.
+ *
  * We no longer handle negotiations for use of trailer protocol: formerly, ARP
  * replied for protocol type ETHERTYPE_TRAIL sent along with IP replies if we
  * wanted trailers sent to us, and also sent them in response to IP replies.
  * This allowed either end to announce the desire to receive trailer packets.
+ *
  * We no longer reply to requests for ETHERTYPE_TRAIL protocol either, but
 @@ -1679,30 +1672,27 @@ arp_dad_stop(struct ifaddr *ifa)
 	kmem_intr_free(dp, sizeof(*dp));
 	ifafree(ifa);
+}
 static void
 arp_dad_timer(struct ifaddr *ifa)
+{
 	struct in_ifaddr *ia = (struct in_ifaddr *)ifa;
 	struct dadq *dp;
 	char ipbuf[INET_ADDRSTRLEN];
 	bool need_free = false;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	mutex_enter(&arp_dad_lock);
 	/* Sanity check */
 	if (ia == NULL) {
 		log(LOG_ERR, "%s: called with null parameter\n", __func__);
 		goto done;
+	}
 	dp = arp_dad_find(ifa);
 	if (dp == NULL) {
 		/* DAD seems to be stopping, so do nothing. */
 		goto done;
+	}
 	if (ia->ia4_flags & IN_IFF_DUPLICATED) {
 @@ -1773,30 +1763,27 @@ announce:
 		    if_name(ifa->ifa_ifp), ARPLOGADDR(&ia->ia_addr.sin_addr));
+	}
 	TAILQ_REMOVE(&dadq, dp, dad_list);
 	need_free = true;
 done:
 	mutex_exit(&arp_dad_lock);
 	if (need_free) {
 		kmem_intr_free(dp, sizeof(*dp));
 		ifafree(ifa);
+	}
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 static void
 arp_dad_duplicated(struct ifaddr *ifa, const char *sha)
+{
 	struct in_ifaddr *ia = (struct in_ifaddr *)ifa;
 	struct ifnet *ifp = ifa->ifa_ifp;
 	char ipbuf[INET_ADDRSTRLEN];
 	const char *iastr;
 	iastr = IN_PRINT(ipbuf, &ia->ia_addr.sin_addr);
 	if (ia->ia4_flags & (IN_IFF_TENTATIVE|IN_IFF_DUPLICATED)) {

--- src/sys/netinet/igmp.c 2017/01/24 07:09:24	1.64
+++ src/sys/netinet/igmp.c 2018/01/02 10:20:34	1.64.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: igmp.c,v 1.64 2017/01/24 07:09:24 ozaki-r Exp $	*/
+/*	$NetBSD: igmp.c,v 1.64.6.1 2018/01/02 10:20:34 snj Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
 @@ -30,27 +30,27 @@
  */
 /*
  * Internet Group Management Protocol (IGMP) routines.
+ *
  * Written by Steve Deering, Stanford, May 1988.
  * Modified by Rosen Sharma, Stanford, Aug 1994.
  * Modified by Bill Fenner, Xerox PARC, Feb 1995.
+ *
  * MULTICAST Revision: 1.3
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.64 2017/01/24 07:09:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.64.6.1 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/systm.h>
 #include <sys/cprng.h>
 #include <sys/sysctl.h>
 @@ -532,56 +532,52 @@ void
 igmp_fasttimo(void)
+{
 	struct in_multi *inm;
 	struct in_multistep step;
 	/*
 	 * Quick check to see if any work needs to be done, in order
 	 * to minimize the overhead of fasttimo processing.
 	 */
 	if (!igmp_timers_on) {
 		return;
+	}
 #ifndef NET_MPSAFE
 	/* XXX: Needed for ip_output(). */
-	mutex_enter(softnet_lock);
+	SOFTNET_LOCK_UNLESS_NET_MPSAFE();
 #endif
 	in_multi_lock(RW_WRITER);
 	igmp_timers_on = false;
 	inm = in_first_multi(&step);
 	while (inm != NULL) {
 		if (inm->inm_timer == 0) {
 			/* do nothing */
 		} else if (--inm->inm_timer == 0) {
 			if (inm->inm_state == IGMP_DELAYING_MEMBER) {
 				if (inm->inm_rti->rti_type == IGMP_v1_ROUTER)
 					igmp_sendpkt(inm,
 					    IGMP_v1_HOST_MEMBERSHIP_REPORT);
 				else
 					igmp_sendpkt(inm,
 					    IGMP_v2_HOST_MEMBERSHIP_REPORT);
 				inm->inm_state = IGMP_IDLE_MEMBER;
+			}
 		} else {
 			igmp_timers_on = true;
+		}
 		inm = in_next_multi(&step);
+	}
 	in_multi_unlock();
-#ifndef NET_MPSAFE
+	SOFTNET_UNLOCK_UNLESS_NET_MPSAFE();
 	mutex_exit(softnet_lock);
 #endif
+}
 void
 igmp_slowtimo(void)
+{
 	router_info_t *rti;
 	in_multi_lock(RW_WRITER);
 	LIST_FOREACH(rti, &rti_head, rti_link) {
 		if (rti->rti_type == IGMP_v1_ROUTER &&
 		    ++rti->rti_age >= IGMP_AGE_THRESHOLD) {
 			rti->rti_type = IGMP_v2_ROUTER;
+		}

--- src/sys/netinet/in.c 2017/12/21 21:08:13	1.203.2.3
+++ src/sys/netinet/in.c 2018/01/02 10:20:34	1.203.2.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in.c,v 1.203.2.3 2017/12/21 21:08:13 snj Exp $	*/
+/*	$NetBSD: in.c,v 1.203.2.4 2018/01/02 10:20:34 snj Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
 @@ -81,27 +81,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.
+ *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.203.2.3 2017/12/21 21:08:13 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.203.2.4 2018/01/02 10:20:34 snj Exp $");
 #include "arp.h"
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet_conf.h"
 #include "opt_mrouting.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 @@ -741,33 +741,29 @@ in_control0(struct socket *so, u_long cm
 out:
 	if (!newifaddr && ia != NULL)
 		ia4_release(ia, &psref);
 	curlwp_bindx(bound);
 	return error;
+}
 int
 in_control(struct socket *so, u_long cmd, void *data, struct ifnet *ifp)
+{
 	int error;
-#ifndef NET_MPSAFE
+	SOFTNET_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 #endif
 	error = in_control0(so, cmd, data, ifp);
-#ifndef NET_MPSAFE
+	SOFTNET_UNLOCK_UNLESS_NET_MPSAFE();
 	mutex_exit(softnet_lock);
 #endif
 	return error;
+}
 /* Add ownaddr as loopback rtentry. */
 static void
 in_ifaddlocal(struct ifaddr *ifa)
+{
 	struct in_ifaddr *ia;
 	ia = (struct in_ifaddr *)ifa;
 	if (ia->ia_addr.sin_addr.s_addr == INADDR_ANY ||
 	    (ia->ia_ifp->if_flags & IFF_POINTOPOINT &&
 @@ -906,31 +902,34 @@ in_addrhash_remove(struct in_ifaddr *ia)
 	mutex_enter(&in_ifaddr_lock);
 	in_addrhash_remove_locked(ia);
 #ifdef NET_MPSAFE
 	pserialize_perform(in_ifaddrhash_psz);
 #endif
 	mutex_exit(&in_ifaddr_lock);
 	IN_ADDRHASH_ENTRY_DESTROY(ia);
+}
 void
 in_purgeif(struct ifnet *ifp)		/* MUST be called at splsoftnet() */
+{
 	IFNET_LOCK(ifp);
 	if_purgeaddrs(ifp, AF_INET, in_purgeaddr);
 	igmp_purgeif(ifp);		/* manipulates pools */
 #ifdef MROUTING
 	ip_mrouter_detach(ifp);
 #endif
 	IFNET_UNLOCK(ifp);
+}
 /*
  * SIOC[GAD]LIFADDR.
  *	SIOCGLIFADDR: get first address. (???)
  *	SIOCGLIFADDR with IFLR_PREFIX:
  *		get first address that matches the specified prefix.
  *	SIOCALIFADDR: add the specified address.
  *	SIOCALIFADDR with IFLR_PREFIX:
  *		EINVAL since we can't deduce hostid part of the address.
  *	SIOCDLIFADDR: delete the specified address.
  *	SIOCDLIFADDR with IFLR_PREFIX:
  *		delete the first address that matches the specified prefix.

--- src/sys/netinet/in_pcb.c 2017/12/21 21:08:13	1.178.4.1
+++ src/sys/netinet/in_pcb.c 2018/01/02 10:20:34	1.178.4.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in_pcb.c,v 1.178.4.1 2017/12/21 21:08:13 snj Exp $	*/
+/*	$NetBSD: in_pcb.c,v 1.178.4.2 2018/01/02 10:20:34 snj Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
 @@ -83,27 +83,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.
+ *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.178.4.1 2017/12/21 21:08:13 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.178.4.2 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 @@ -767,27 +767,30 @@ in_pcbpurgeif0(struct inpcbtable *table,
 	TAILQ_FOREACH_SAFE(inph, &table->inpt_queue, inph_queue, ninph) {
 		struct inpcb *inp = (struct inpcb *)inph;
 		bool need_unlock = false;
 		if (inp->inp_af != AF_INET)
 			continue;
 		/* The caller holds either one of inps' lock */
 		if (!inp_locked(inp)) {
 			inp_lock(inp);
 			need_unlock = true;
+		}
 		/* IFNET_LOCK must be taken after solock */
 		IFNET_LOCK(ifp);
 		in_purgeifmcast(inp->inp_moptions, ifp);
 		IFNET_UNLOCK(ifp);
 		if (need_unlock)
 			inp_unlock(inp);
+	}
+}
 void
 in_pcbpurgeif(struct inpcbtable *table, struct ifnet *ifp)
+{
 	struct rtentry *rt;
 	struct inpcb_hdr *inph, *ninph;
 	TAILQ_FOREACH_SAFE(inph, &table->inpt_queue, inph_queue, ninph) {

--- src/sys/netinet/ip_carp.c 2017/12/10 10:10:25	1.90.2.2
+++ src/sys/netinet/ip_carp.c 2018/01/02 10:20:34	1.90.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_carp.c,v 1.90.2.2 2017/12/10 10:10:25 snj Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.90.2.3 2018/01/02 10:20:34 snj Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
  * Copyright (c) 2003 Ryan McBride. 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
 @@ -23,27 +23,27 @@
  * SERVICES; LOSS OF MIND, 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.
  */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_mbuftrace.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.90.2.2 2017/12/10 10:10:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.90.2.3 2018/01/02 10:20:34 snj Exp $");
 /*
  * TODO:
  *	- iface reconfigure
  *	- support for hardware checksum calculations;
+ *
  */
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -885,27 +885,26 @@ carp_clone_create(struct if_clone *ifc,
 	if (rv != 0) {
 		callout_destroy(&sc->sc_ad_tmo);
 		callout_destroy(&sc->sc_md_tmo);
 		callout_destroy(&sc->sc_md6_tmo);
 		free(ifp->if_softc, M_DEVBUF);
 		return rv;
+	}
 	ether_ifattach(ifp, NULL);
 	carp_set_enaddr(sc);
 	/* Overwrite ethernet defaults */
 	ifp->if_type = IFT_CARP;
 	ifp->if_output = carp_output;
 	ifp->if_extflags &= ~IFEF_OUTPUT_MPSAFE;
 	if_register(ifp);
 	return (0);
+}
 static int
 carp_clone_destroy(struct ifnet *ifp)
+{
 	struct carp_softc *sc = ifp->if_softc;
 	carpdetach(ifp->if_softc);
 	ether_ifdetach(ifp);
 	if_detach(ifp);
 @@ -2226,27 +2225,33 @@ carp_set_state(struct carp_softc *sc, in
 	sc->sc_state = state;
 	switch (state) {
 	case BACKUP:
 		link_state = LINK_STATE_DOWN;
 		break;
 	case MASTER:
 		link_state = LINK_STATE_UP;
 		break;
 	default:
 		link_state = LINK_STATE_UNKNOWN;
 		break;
+	}
 	/*
 	 * The lock is needed to serialize a call of
 	 * if_link_state_change_softint from here and a call from softint.
 	 */
 	KERNEL_LOCK(1, NULL);
 	if_link_state_change_softint(&sc->sc_if, link_state);
 	KERNEL_UNLOCK_ONE(NULL);
+}
 void
 carp_carpdev_state(void *v)
+{
 	struct carp_if *cif;
 	struct carp_softc *sc;
 	struct ifnet *ifp = v;
 	if (ifp->if_type == IFT_CARP)
 		return;
 	cif = (struct carp_if *)ifp->if_carp;

--- src/sys/netinet/ip_flow.c 2017/02/07 02:38:08	1.80
+++ src/sys/netinet/ip_flow.c 2018/01/02 10:20:34	1.80.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_flow.c,v 1.80 2017/02/07 02:38:08 ozaki-r Exp $	*/
+/*	$NetBSD: ip_flow.c,v 1.80.6.1 2018/01/02 10:20:34 snj Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the 3am Software Foundry ("3am").  It was developed by Matt Thomas.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.80 2017/02/07 02:38:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_flow.c,v 1.80.6.1 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socketvar.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 @@ -472,76 +472,68 @@ ipflow_reap(bool just_one)
 static unsigned int ipflow_work_enqueued = 0;
 static void
 ipflow_slowtimo_work(struct work *wk, void *arg)
+{
 	struct rtentry *rt;
 	struct ipflow *ipf, *next_ipf;
 	uint64_t *ips;
 	/* We can allow enqueuing another work at this point */
 	atomic_swap_uint(&ipflow_work_enqueued, 0);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	mutex_enter(&ipflow_lock);
 	for (ipf = TAILQ_FIRST(&ipflowlist); ipf != NULL; ipf = next_ipf) {
 		next_ipf = TAILQ_NEXT(ipf, ipf_list);
 		if (PRT_SLOW_ISEXPIRED(ipf->ipf_timer) ||
 		    (rt = rtcache_validate(&ipf->ipf_ro)) == NULL) {
 			ipflow_free(ipf);
 		} else {
 			ipf->ipf_last_uses = ipf->ipf_uses;
 			rt->rt_use += ipf->ipf_uses;
 			rtcache_unref(rt, &ipf->ipf_ro);
 			ips = IP_STAT_GETREF();
 			ips[IP_STAT_TOTAL] += ipf->ipf_uses;
 			ips[IP_STAT_FORWARD] += ipf->ipf_uses;
 			ips[IP_STAT_FASTFORWARD] += ipf->ipf_uses;
 			IP_STAT_PUTREF();
 			ipf->ipf_uses = 0;
+		}
+	}
 	mutex_exit(&ipflow_lock);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 void
 ipflow_slowtimo(void)
+{
 	/* Avoid enqueuing another work when one is already enqueued */
 	if (atomic_swap_uint(&ipflow_work_enqueued, 1) == 1)
 		return;
 	workqueue_enqueue(ipflow_slowtimo_wq, &ipflow_slowtimo_wk, NULL);
+}
 void
 ipflow_create(struct route *ro, struct mbuf *m)
+{
 	const struct ip *const ip = mtod(m, const struct ip *);
 	struct ipflow *ipf;
 	size_t hash;
-#ifndef NET_MPSAFE
+	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	KERNEL_LOCK(1, NULL);
 #endif
 	mutex_enter(&ipflow_lock);
 	/*
 	 * Don't create cache entries for ICMP messages.
 	 */
 	if (ip_maxflows == 0 || ip->ip_p == IPPROTO_ICMP)
 		goto out;
 	/*
 	 * See if an existing flow struct exists.  If so remove it from its
 	 * list and free the old route.  If not, try to malloc a new one
 	 * (if we aren't at our limit).
 	 */
 @@ -572,29 +564,27 @@ ipflow_create(struct route *ro, struct m
 	ipf->ipf_dst = ip->ip_dst;
 	ipf->ipf_src = ip->ip_src;
 	ipf->ipf_tos = ip->ip_tos;
 	PRT_SLOW_ARM(ipf->ipf_timer, IPFLOW_TIMER);
 	/*
 	 * Insert into the approriate bucket of the flow table.
 	 */
 	hash = ipflow_hash(ip);
 	IPFLOW_INSERT(hash, ipf);
  out:
 	mutex_exit(&ipflow_lock);
-#ifndef NET_MPSAFE
+	KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 #endif
+}
 int
 ipflow_invalidate_all(int new_size)
+{
 	struct ipflow *ipf, *next_ipf;
 	int error;
 	error = 0;
 	mutex_enter(&ipflow_lock);
 	for (ipf = TAILQ_FIRST(&ipflowlist); ipf != NULL; ipf = next_ipf) {
 @@ -612,69 +602,57 @@ ipflow_invalidate_all(int new_size)
 /*
  * sysctl helper routine for net.inet.ip.maxflows.
  */
 static int
 sysctl_net_inet_ip_maxflows(SYSCTLFN_ARGS)
+{
 	int error;
 	error = sysctl_lookup(SYSCTLFN_CALL(rnode));
 	if (error || newp == NULL)
 		return (error);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	mutex_enter(&ipflow_lock);
 	ipflow_reap(false);
 	mutex_exit(&ipflow_lock);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
 	return (0);
+}
 static int
 sysctl_net_inet_ip_hashsize(SYSCTLFN_ARGS)
+{
 	int error, tmp;
 	struct sysctlnode node;
 	node = *rnode;
 	tmp = ip_hashsize;
 	node.sysctl_data = &tmp;
 	error = sysctl_lookup(SYSCTLFN_CALL(&node));
 	if (error || newp == NULL)
 		return (error);
 	if ((tmp & (tmp - 1)) == 0 && tmp != 0) {
 		/*
 		 * Can only fail due to malloc()
 		 */
-#ifndef NET_MPSAFE
+		SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 		mutex_enter(softnet_lock);
 		KERNEL_LOCK(1, NULL);
 #endif
 		error = ipflow_invalidate_all(tmp);
-#ifndef NET_MPSAFE
+		SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 		KERNEL_UNLOCK_ONE(NULL);
 		mutex_exit(softnet_lock);
 #endif
 	} else {
 		/*
 		 * EINVAL if not a power of 2
 	         */
 		error = EINVAL;
+	}
 	return error;
+}
 static void
 ipflow_sysctl_init(struct sysctllog **clog)
+{

--- src/sys/netinet/ip_input.c 2017/12/10 09:24:30	1.355.2.2
+++ src/sys/netinet/ip_input.c 2018/01/02 10:20:34	1.355.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_input.c,v 1.355.2.2 2017/12/10 09:24:30 snj Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.355.2.3 2018/01/02 10:20:34 snj Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
 @@ -81,27 +81,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.
+ *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.355.2.2 2017/12/10 09:24:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.355.2.3 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
 #include "opt_gateway.h"
 #include "opt_ipsec.h"
 #include "opt_mrouting.h"
 #include "opt_mbuftrace.h"
 #include "opt_inet_csum.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include "arp.h"
 @@ -428,35 +428,31 @@ matched:
 	return ia;
+}
 /*
  * IP software interrupt routine.
  */
 static void
 ipintr(void *arg __unused)
+{
 	struct mbuf *m;
 	KASSERT(cpu_softintr_p());
-#ifndef NET_MPSAFE
+	SOFTNET_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 #endif
 	while ((m = pktq_dequeue(ip_pktq)) != NULL) {
 		ip_input(m);
+	}
-#ifndef NET_MPSAFE
+	SOFTNET_UNLOCK_UNLESS_NET_MPSAFE();
 	mutex_exit(softnet_lock);
 #endif
+}
 /*
  * IP input routine.  Checksum and byte swap header.  If fragmented
  * try to reassemble.  Process options.  Pass to next level.
  */
 static void
 ip_input(struct mbuf *m)
+{
 	struct ip *ip = NULL;
 	struct in_ifaddr *ia = NULL;
 	int hlen = 0, len;
 	int downmatch;
 @@ -844,37 +840,31 @@ ours:
 out:
 	m_put_rcvif_psref(ifp, &psref);
 	if (m != NULL)
 		m_freem(m);
+}
 /*
  * IP timer processing.
  */
 void
 ip_slowtimo(void)
+{
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	ip_reass_slowtimo();
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 /*
  * IP drain processing.
  */
 void
 ip_drain(void)
+{
 	KERNEL_LOCK(1, NULL);
 	ip_reass_drain();
 	KERNEL_UNLOCK_ONE(NULL);
+}

--- src/sys/netinet/ip_mroute.c 2017/12/10 09:41:31	1.146.6.1
+++ src/sys/netinet/ip_mroute.c 2018/01/02 10:20:34	1.146.6.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_mroute.c,v 1.146.6.1 2017/12/10 09:41:31 snj Exp $	*/
+/*	$NetBSD: ip_mroute.c,v 1.146.6.2 2018/01/02 10:20:34 snj Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *      The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Stephen Deering of Stanford University.
+ *
  * 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.
 @@ -83,27 +83,27 @@
  * Modified by Charles M. Hannum, NetBSD, May 1995.
  * Modified by Ahmed Helmy, SGI, June 1996
  * Modified by George Edmond Eddy (Rusty), ISI, February 1998
  * Modified by Pavlin Radoslavov, USC/ISI, May 1998, August 1999, October 2000
  * Modified by Hitoshi Asaeda, WIDE, August 2000
  * Modified by Pavlin Radoslavov, ICSI, October 2002
+ *
  * MROUTING Revision: 1.2
  * and PIM-SMv2 and PIM-DM support, advanced API support,
  * bandwidth metering and signaling
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.146.6.1 2017/12/10 09:41:31 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.146.6.2 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_pim.h"
 #endif
 #ifdef PIM
 #define _PIM_VT 1
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -1576,27 +1576,27 @@ expire_upcalls(void *v)
 			nrt = LIST_NEXT(rt, mfc_hash);
 			if (rt->mfc_expire == 0 || --rt->mfc_expire > 0)
 				continue;
 			nexpire[i]--;
 			/*
 			 * free the bw_meter entries
 			 */
 			while (rt->mfc_bw_meter != NULL) {
 				struct bw_meter *x = rt->mfc_bw_meter;
 				rt->mfc_bw_meter = x->bm_mfc_next;
-				kmem_free(x, sizeof(*x));
+				kmem_intr_free(x, sizeof(*x));
+			}
 			++mrtstat.mrts_cache_cleanups;
 			if (mrtdebug & DEBUG_EXPIRE)
 				log(LOG_DEBUG,
 				    "expire_upcalls: expiring (%x %x)\n",
 				    ntohl(rt->mfc_origin.s_addr),
 				    ntohl(rt->mfc_mcastgrp.s_addr));
 			expire_mfc(rt);
+		}
+	}
 @@ -2521,27 +2521,27 @@ add_bw_upcall(struct bw_upcall *req)
     splx(s);
     return 0;
+}
 static void
 free_bw_list(struct bw_meter *list)
+{
     while (list != NULL) {
 	struct bw_meter *x = list;
 	list = list->bm_mfc_next;
 	unschedule_bw_meter(x);
-	kmem_free(x, sizeof(*x));
+	kmem_intr_free(x, sizeof(*x));
+    }
+}
 /*
  * Delete one or multiple bw_meter entries
  */
 static int
 del_bw_upcall(struct bw_upcall *req)
+{
     int s;
     struct mfc *mfc;
     struct bw_meter *x;
 @@ -2580,27 +2580,27 @@ del_bw_upcall(struct bw_upcall *req)
 		(x->bm_threshold.b_bytes == req->bu_threshold.b_bytes) &&
 		(x->bm_flags & BW_METER_USER_FLAGS) == flags)
 		break;
+	}
 	if (x != NULL) { /* Delete entry from the list for this MFC */
 	    if (prev != NULL)
 		prev->bm_mfc_next = x->bm_mfc_next;	/* remove from middle*/
 	    else
 		x->bm_mfc->mfc_bw_meter = x->bm_mfc_next;/* new head of list */
 	    unschedule_bw_meter(x);
 	    splx(s);
 	    /* Free the bw_meter entry */
-	    kmem_free(x, sizeof(*x));
+	    kmem_intr_free(x, sizeof(*x));
 	    return 0;
 	} else {
 	    splx(s);
 	    return EINVAL;
+	}
+    }
     /* NOTREACHED */
+}
 /*
  * Perform bandwidth measurement processing that may result in an upcall
  */
 static void

--- src/sys/netinet/ip_output.c 2017/12/21 21:08:13	1.279.2.2
+++ src/sys/netinet/ip_output.c 2018/01/02 10:20:34	1.279.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_output.c,v 1.279.2.2 2017/12/21 21:08:13 snj Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.279.2.3 2018/01/02 10:20:34 snj Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
 @@ -81,27 +81,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.
+ *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.279.2.2 2017/12/21 21:08:13 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.279.2.3 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_mrouting.h"
 #include "opt_net_mpsafe.h"
 #include "opt_mpls.h"
 #endif
 #include "arp.h"
 #include <sys/param.h>
 #include <sys/kmem.h>
 @@ -1761,27 +1761,30 @@ ip_add_membership(struct ip_moptions *im
 		error = EADDRINUSE;
 		goto out;
+	}
 	if (i == IP_MAX_MEMBERSHIPS) {
 		error = ETOOMANYREFS;
 		goto out;
+	}
 	/*
 	 * Everything looks good; add a new record to the multicast
 	 * address list for the given interface.
 	 */
-	if ((imo->imo_membership[i] = in_addmulti(&ia, ifp)) == NULL) {
+	IFNET_LOCK(ifp);
 	imo->imo_membership[i] = in_addmulti(&ia, ifp);
 	IFNET_UNLOCK(ifp);
 	if (imo->imo_membership[i] == NULL) {
 		error = ENOBUFS;
 		goto out;
+	}
 	++imo->imo_num_memberships;
 	error = 0;
 out:
 	if_put(ifp, &psref);
 	curlwp_bindx(bound);
 	return error;
+}
 /*
 @@ -1820,27 +1823,29 @@ ip_drop_membership(struct ip_moptions *i
 		     imo->imo_membership[i]->inm_ifp == ifp) &&
 		    in_hosteq(imo->imo_membership[i]->inm_addr, ia))
 			break;
+	}
 	if (i == imo->imo_num_memberships) {
 		error = EADDRNOTAVAIL;
 		goto out;
+	}
 	/*
 	 * Give up the multicast address record to which the
 	 * membership points.
 	 */
 	IFNET_LOCK(ifp);
 	in_delmulti(imo->imo_membership[i]);
 	IFNET_UNLOCK(ifp);
 	/*
 	 * Remove the gap in the membership array.
 	 */
 	for (++i; i < imo->imo_num_memberships; ++i)
 		imo->imo_membership[i-1] = imo->imo_membership[i];
 	--imo->imo_num_memberships;
 	error = 0;
 out:
 	if_put(ifp, &psref);
 	curlwp_bindx(bound);
 	return error;
+}
 @@ -1940,27 +1945,27 @@ ip_setmoptions(struct ip_moptions **pimo
 	default:
 		error = EOPNOTSUPP;
 		break;
+	}
 	/*
 	 * If all options have default values, no need to keep the mbuf.
 	 */
 	if (imo->imo_multicast_if_index == 0 &&
 	    imo->imo_multicast_ttl == IP_DEFAULT_MULTICAST_TTL &&
 	    imo->imo_multicast_loop == IP_DEFAULT_MULTICAST_LOOP &&
 	    imo->imo_num_memberships == 0) {
-		kmem_free(imo, sizeof(*imo));
+		kmem_intr_free(imo, sizeof(*imo));
 		*pimo = NULL;
+	}
 	return error;
+}
 /*
  * Return the IP multicast options in response to user getsockopt().
  */
 int
 ip_getmoptions(struct ip_moptions *imo, struct sockopt *sopt)
+{
 	struct in_addr addr;
 @@ -2013,29 +2018,36 @@ ip_getmoptions(struct ip_moptions *imo,
+}
 /*
  * Discard the IP multicast options.
  */
 void
 ip_freemoptions(struct ip_moptions *imo)
+{
 	int i;
 	/* The owner of imo (inp) should be protected by solock */
 	if (imo != NULL) {
-		for (i = 0; i < imo->imo_num_memberships; ++i)
+		for (i = 0; i < imo->imo_num_memberships; ++i) {
-			in_delmulti(imo->imo_membership[i]);
+			struct in_multi *inm = imo->imo_membership[i];
-		kmem_free(imo, sizeof(*imo));
+			struct ifnet *ifp = inm->inm_ifp;
 			IFNET_LOCK(ifp);
 			in_delmulti(inm);
 			/* ifp should not leave thanks to solock */
 			IFNET_UNLOCK(ifp);
+		}
 		kmem_intr_free(imo, sizeof(*imo));
+	}
+}
 /*
  * Routine called from ip_output() to loop back a copy of an IP multicast
  * packet to the input queue of a specified interface.  Note that this
  * calls the output routine of the loopback "driver", but with an interface
  * pointer that might NOT be lo0ifp -- easier than replicating that code here.
  */
 static void
 ip_mloopback(struct ifnet *ifp, struct mbuf *m, const struct sockaddr_in *dst)
+{
 	struct ip *ip;
 @@ -2051,33 +2063,29 @@ ip_mloopback(struct ifnet *ifp, struct m
 	 * We don't bother to fragment if the IP length is greater
 	 * than the interface's MTU.  Can this possibly matter?
 	 */
 	ip = mtod(copym, struct ip *);
 	if (copym->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4)) {
 		in_delayed_cksum(copym);
 		copym->m_pkthdr.csum_flags &=
 		    ~(M_CSUM_TCPv4|M_CSUM_UDPv4);
+	}
 	ip->ip_sum = 0;
 	ip->ip_sum = in_cksum(copym, ip->ip_hl << 2);
-#ifndef NET_MPSAFE
+	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	KERNEL_LOCK(1, NULL);
 #endif
 	(void)looutput(ifp, copym, sintocsa(dst), NULL);
-#ifndef NET_MPSAFE
+	KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 #endif
+}
 /*
  * Ensure sending address is valid.
  * Returns 0 on success, -1 if an error should be sent back or 1
  * if the packet could be dropped without error (protocol dependent).
  */
 static int
 ip_ifaddrvalid(const struct in_ifaddr *ia)
+{
 	if (ia->ia_addr.sin_addr.s_addr == INADDR_ANY)
 		return 0;

--- src/sys/netinet6/frag6.c 2017/01/24 07:09:25	1.60
+++ src/sys/netinet6/frag6.c 2018/01/02 10:20:34	1.60.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: frag6.c,v 1.60 2017/01/24 07:09:25 ozaki-r Exp $	*/
+/*	$NetBSD: frag6.c,v 1.60.6.1 2018/01/02 10:20:34 snj Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -21,27 +21,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.60 2017/01/24 07:09:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.60.6.1 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 @@ -587,86 +587,74 @@ void
 frag6_remque(struct ip6q *p6)
+{
 	KASSERT(mutex_owned(&frag6_lock));
 	p6->ip6q_prev->ip6q_next = p6->ip6q_next;
 	p6->ip6q_next->ip6q_prev = p6->ip6q_prev;
+}
 void
 frag6_fasttimo(void)
+{
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	if (frag6_drainwanted) {
 		frag6_drain();
 		frag6_drainwanted = 0;
+	}
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 /*
  * IPv6 reassembling timer processing;
  * if a timer expires on a reassembly
  * queue, discard it.
  */
 void
 frag6_slowtimo(void)
+{
 	struct ip6q *q6;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	mutex_enter(&frag6_lock);
 	q6 = ip6q.ip6q_next;
 	if (q6)
 		while (q6 != &ip6q) {
 			--q6->ip6q_ttl;
 			q6 = q6->ip6q_next;
 			if (q6->ip6q_prev->ip6q_ttl == 0) {
 				IP6_STATINC(IP6_STAT_FRAGTIMEOUT);
 				/* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */
 				frag6_freef(q6->ip6q_prev);
+			}
+		}
 	/*
 	 * If we are over the maximum number of fragments
 	 * (due to the limit being lowered), drain off
 	 * enough to get down to the new limit.
 	 */
 	while (frag6_nfragpackets > (u_int)ip6_maxfragpackets &&
 	    ip6q.ip6q_prev) {
 		IP6_STATINC(IP6_STAT_FRAGOVERFLOW);
 		/* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */
 		frag6_freef(ip6q.ip6q_prev);
+	}
 	mutex_exit(&frag6_lock);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
 #if 0
 	/*
 	 * Routing changes might produce a better route than we last used;
 	 * make sure we notice eventually, even if forwarding only for one
 	 * destination and the cache is never replaced.
 	 */
 	rtcache_free(&ip6_forward_rt);
 	rtcache_free(&ipsrcchk_rt);
 #endif
+}

--- src/sys/netinet6/in6.c 2017/11/30 15:57:37	1.245.2.3
+++ src/sys/netinet6/in6.c 2018/01/02 10:20:34	1.245.2.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in6.c,v 1.245.2.3 2017/11/30 15:57:37 martin Exp $	*/
+/*	$NetBSD: in6.c,v 1.245.2.4 2018/01/02 10:20:34 snj Exp $	*/
 /*	$KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -52,27 +52,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.
+ *
  *	@(#)in.c	8.2 (Berkeley) 11/15/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.245.2.3 2017/11/30 15:57:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.245.2.4 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -757,33 +757,29 @@ in6_control(struct socket *so, u_long cm
 	case SIOCAADDRCTL_POLICY:
 	case SIOCDADDRCTL_POLICY:
 		if (kauth_authorize_network(curlwp->l_cred,
 		    KAUTH_NETWORK_SOCKET,
 		    KAUTH_REQ_NETWORK_SOCKET_SETPRIV,
 		    so, NULL, NULL))
 			return EPERM;
 		break;
+	}
 	s = splsoftnet();
-#ifndef NET_MPSAFE
+	SOFTNET_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 #endif
 	error = in6_control1(so , cmd, data, ifp);
-#ifndef NET_MPSAFE
+	SOFTNET_UNLOCK_UNLESS_NET_MPSAFE();
 	mutex_exit(softnet_lock);
 #endif
 	splx(s);
 	return error;
+}
 static int
 in6_get_llsol_addr(struct in6_addr *llsol, struct ifnet *ifp,
     struct in6_addr *ip6)
+{
 	int error;
 	memset(llsol, 0, sizeof(struct in6_addr));
 	llsol->s6_addr16[0] = htons(0xff02);
 	llsol->s6_addr32[1] = 0;
 @@ -1379,47 +1375,50 @@ in6_update_ifa(struct ifnet *ifp, struct
 	rc = in6_update_ifa1(ifp, ifra, NULL, NULL, flags);
 	splx(s);
 	return rc;
+}
 void
 in6_purgeaddr(struct ifaddr *ifa)
+{
 	struct ifnet *ifp = ifa->ifa_ifp;
 	struct in6_ifaddr *ia = (struct in6_ifaddr *) ifa;
 	struct in6_multi_mship *imm;
 	KASSERT(!ifa_held(ifa));
 	KASSERT(IFNET_LOCKED(ifp));
 	ifa->ifa_flags |= IFA_DESTROYING;
 	/* stop DAD processing */
 	nd6_dad_stop(ifa);
 	/* Delete any network route. */
 	in6_ifremprefix(ia);
 	/* Remove ownaddr's loopback rtentry, if it exists. */
 	in6_ifremlocal(&(ia->ia_ifa));
 	/*
 	 * leave from multicast groups we have joined for the interface
 	 */
     again:
 	mutex_enter(&in6_ifaddr_lock);
 	while ((imm = LIST_FIRST(&ia->ia6_memberships)) != NULL) {
 		LIST_REMOVE(imm, i6mm_chain);
 		mutex_exit(&in6_ifaddr_lock);
 		KASSERT(imm->i6mm_maddr->in6m_ifp == ifp);
 		in6_leavegroup(imm);
-		mutex_enter(&in6_ifaddr_lock);
+		goto again;
+	}
 	mutex_exit(&in6_ifaddr_lock);
 	in6_unlink_ifa(ia, ifp);
+}
 static void
 in6_unlink_ifa(struct in6_ifaddr *ia, struct ifnet *ifp)
+{
 	int	s = splsoftnet();
 	mutex_enter(&in6_ifaddr_lock);
 	IN6_ADDRLIST_WRITER_REMOVE(ia);
 @@ -1450,27 +1449,29 @@ in6_unlink_ifa(struct in6_ifaddr *ia, st
 	/*
 	 * release another refcnt for the link from in6_ifaddr.
 	 * Note that we should decrement the refcnt at least once for all *BSD.
 	 */
 	ifafree(&ia->ia_ifa);
 	splx(s);
+}
 void
 in6_purgeif(struct ifnet *ifp)
+{
 	IFNET_LOCK(ifp);
 	in6_ifdetach(ifp);
 	IFNET_UNLOCK(ifp);
+}
 void
 in6_purge_mcast_references(struct in6_multi *in6m)
+{
 	struct	in6_ifaddr *ia;
 	KASSERT(in6_multi_locked(RW_WRITER));
 	mutex_enter(&in6_ifaddr_lock);
 	IN6_ADDRLIST_WRITER_FOREACH(ia) {
 		struct in6_multi_mship *imm;
 		LIST_FOREACH(imm, &ia->ia6_memberships, i6mm_chain) {
 @@ -2706,33 +2707,29 @@ in6_domifattach(struct ifnet *ifp)
 	ext->lltable = in6_lltattach(ifp);
 	return ext;
+}
 void
 in6_domifdetach(struct ifnet *ifp, void *aux)
+{
 	struct in6_ifextra *ext = (struct in6_ifextra *)aux;
 	lltable_free(ext->lltable);
 	ext->lltable = NULL;
-#ifndef NET_MPSAFE
+	SOFTNET_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 #endif
 	nd6_ifdetach(ifp, ext);
-#ifndef NET_MPSAFE
+	SOFTNET_UNLOCK_UNLESS_NET_MPSAFE();
 	mutex_exit(softnet_lock);
 #endif
 	free(ext->in6_ifstat, M_IFADDR);
 	free(ext->icmp6_ifstat, M_IFADDR);
 	scope6_ifdetach(ext->scope6_id);
 	free(ext, M_IFADDR);
+}
 /*
  * Convert IPv4 address stored in struct in_addr to IPv4-Mapped IPv6 address
  * stored in struct in6_addr as defined in RFC 4921 section 2.5.5.2.
  */
 void
 in6_in_2_v4mapin6(const struct in_addr *in, struct in6_addr *in6)
+{

--- src/sys/netinet6/in6_pcb.c 2017/04/25 05:44:11	1.161
+++ src/sys/netinet6/in6_pcb.c 2018/01/02 10:20:34	1.161.4.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in6_pcb.c,v 1.161 2017/04/25 05:44:11 ozaki-r Exp $	*/
+/*	$NetBSD: in6_pcb.c,v 1.161.4.1 2018/01/02 10:20:34 snj Exp $	*/
 /*	$KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -52,27 +52,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.
+ *
  *	@(#)in_pcb.c	8.2 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.161 2017/04/25 05:44:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.161.4.1 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/ioctl.h>
 @@ -865,31 +865,38 @@ in6_pcbpurgeif0(struct inpcbtable *table
 			if (im6o->im6o_multicast_if_index == ifp->if_index)
 				im6o->im6o_multicast_if_index = 0;
 			/*
 			 * Drop multicast group membership if we joined
 			 * through the interface being detached.
 			 * XXX controversial - is it really legal for kernel
 			 * to force this?
 			 */
 			LIST_FOREACH_SAFE(imm, &im6o->im6o_memberships,
 			    i6mm_chain, nimm) {
 				if (imm->i6mm_maddr->in6m_ifp == ifp) {
 					LIST_REMOVE(imm, i6mm_chain);
 					IFNET_LOCK(ifp);
 					in6_leavegroup(imm);
 					IFNET_UNLOCK(ifp);
+				}
+			}
+		}
 		/* IFNET_LOCK must be taken after solock */
 		IFNET_LOCK(ifp);
 		in_purgeifmcast(in6p->in6p_v4moptions, ifp);
 		IFNET_UNLOCK(ifp);
 		if (need_unlock)
 			in6p_unlock(in6p);
+	}
+}
 void
 in6_pcbpurgeif(struct inpcbtable *table, struct ifnet *ifp)
+{
 	struct rtentry *rt;
 	struct inpcb_hdr *inph, *ninph;
 	TAILQ_FOREACH_SAFE(inph, &table->inpt_queue, inph_queue, ninph) {
 		struct in6pcb *in6p = (struct in6pcb *)inph;

--- src/sys/netinet6/ip6_flow.c 2017/01/11 13:08:29	1.34
+++ src/sys/netinet6/ip6_flow.c 2018/01/02 10:20:34	1.34.8.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip6_flow.c,v 1.34 2017/01/11 13:08:29 ozaki-r Exp $	*/
+/*	$NetBSD: ip6_flow.c,v 1.34.8.1 2018/01/02 10:20:34 snj Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the 3am Software Foundry ("3am").  It was developed by Liam J. Foy
  * <liamjfoy@netbsd.org> and Matt Thomas <matt@netbsd.org>.
+ *
  * 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
 @@ -28,27 +28,27 @@
  * 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.
+ *
  * IPv6 version was developed by Liam J. Foy. Original source existed in IPv4
  * format developed by Matt Thomas. Thanks to Joerg Sonnenberger, Matt
  * Thomas and Christos Zoulas.
+ *
  * Thanks to Liverpool John Moores University, especially Dr. David Llewellyn-Jones
  * for providing resources (to test) and Professor Madjid Merabti.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.34 2017/01/11 13:08:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.34.8.1 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socketvar.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/pool.h>
 @@ -509,82 +509,74 @@ ip6flow_reap(int just_one)
 	return ip6f;
+}
 static unsigned int ip6flow_work_enqueued = 0;
 void
 ip6flow_slowtimo_work(struct work *wk, void *arg)
+{
 	struct ip6flow *ip6f, *next_ip6f;
 	/* We can allow enqueuing another work at this point */
 	atomic_swap_uint(&ip6flow_work_enqueued, 0);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	mutex_enter(&ip6flow_lock);
 	for (ip6f = TAILQ_FIRST(&ip6flowlist); ip6f != NULL; ip6f = next_ip6f) {
 		struct rtentry *rt = NULL;
 		next_ip6f = TAILQ_NEXT(ip6f, ip6f_list);
 		if (PRT_SLOW_ISEXPIRED(ip6f->ip6f_timer) ||
 		    (rt = rtcache_validate(&ip6f->ip6f_ro)) == NULL) {
 			ip6flow_free(ip6f);
 		} else {
 			ip6f->ip6f_last_uses = ip6f->ip6f_uses;
 			ip6flow_addstats_rt(rt, ip6f);
 			ip6f->ip6f_uses = 0;
 			ip6f->ip6f_dropped = 0;
 			ip6f->ip6f_forwarded = 0;
+		}
 		rtcache_unref(rt, &ip6f->ip6f_ro);
+	}
 	mutex_exit(&ip6flow_lock);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 void
 ip6flow_slowtimo(void)
+{
 	/* Avoid enqueuing another work when one is already enqueued */
 	if (atomic_swap_uint(&ip6flow_work_enqueued, 1) == 1)
 		return;
 	workqueue_enqueue(ip6flow_slowtimo_wq, &ip6flow_slowtimo_wk, NULL);
+}
 /*
  * We have successfully forwarded a packet using the normal
  * IPv6 stack. Now create/update a flow.
  */
 void
 ip6flow_create(struct route *ro, struct mbuf *m)
+{
 	const struct ip6_hdr *ip6;
 	struct ip6flow *ip6f;
 	size_t hash;
 	ip6 = mtod(m, const struct ip6_hdr *);
-#ifndef NET_MPSAFE
+	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	KERNEL_LOCK(1, NULL);
 #endif
 	mutex_enter(&ip6flow_lock);
 	/*
 	 * If IPv6 Fast Forward is disabled, don't create a flow.
 	 * It can be disabled by setting net.inet6.ip6.maxflows to 0.
+	 *
 	 * Don't create a flow for ICMPv6 messages.
 	 */
 	if (ip6_maxflows == 0 || ip6->ip6_nxt == IPPROTO_IPV6_ICMP)
 		goto out;
 	/*
 	 * See if an existing flow exists.  If so:
 @@ -626,29 +618,27 @@ ip6flow_create(struct route *ro, struct
 	ip6f->ip6f_dst = ip6->ip6_dst;
 	ip6f->ip6f_src = ip6->ip6_src;
 	ip6f->ip6f_flow = ip6->ip6_flow;
 	PRT_SLOW_ARM(ip6f->ip6f_timer, IP6FLOW_TIMER);
 	/*
 	 * Insert into the approriate bucket of the flow table.
 	 */
 	hash = ip6flow_hash(ip6);
 	IP6FLOW_INSERT(hash, ip6f);
  out:
 	mutex_exit(&ip6flow_lock);
-#ifndef NET_MPSAFE
+	KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 #endif
+}
 /*
  * Invalidate/remove all flows - if new_size is positive we
  * resize the hash table.
  */
 int
 ip6flow_invalidate_all(int new_size)
+{
 	struct ip6flow *ip6f, *next_ip6f;
 	int error;
 	error = 0;
 @@ -671,67 +661,55 @@ ip6flow_invalidate_all(int new_size)
 /*
  * sysctl helper routine for net.inet.ip6.maxflows. Since
  * we could reduce this value, call ip6flow_reap();
  */
 static int
 sysctl_net_inet6_ip6_maxflows(SYSCTLFN_ARGS)
+{
 	int error;
 	error = sysctl_lookup(SYSCTLFN_CALL(rnode));
 	if (error || newp == NULL)
 		return (error);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	ip6flow_reap(0);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
 	return (0);
+}
 static int
 sysctl_net_inet6_ip6_hashsize(SYSCTLFN_ARGS)
+{
 	int error, tmp;
 	struct sysctlnode node;
 	node = *rnode;
 	tmp = ip6_hashsize;
 	node.sysctl_data = &tmp;
 	error = sysctl_lookup(SYSCTLFN_CALL(&node));
 	if (error || newp == NULL)
 		return (error);
 	if ((tmp & (tmp - 1)) == 0 && tmp != 0) {
 		/*
 		 * Can only fail due to malloc()
 		 */
-#ifndef NET_MPSAFE
+		SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 		mutex_enter(softnet_lock);
 		KERNEL_LOCK(1, NULL);
 #endif
 		error = ip6flow_invalidate_all(tmp);
-#ifndef NET_MPSAFE
+		SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 		KERNEL_UNLOCK_ONE(NULL);
 		mutex_exit(softnet_lock);
 #endif
 	} else {
 		/*
 		 * EINVAL if not a power of 2
 		 */
 		error = EINVAL;
+	}
 	return error;
+}
 static void
 ip6flow_sysctl_init(struct sysctllog **clog)
+{

--- src/sys/netinet6/ip6_input.c 2017/12/10 09:24:30	1.178.2.2
+++ src/sys/netinet6/ip6_input.c 2018/01/02 10:20:34	1.178.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip6_input.c,v 1.178.2.2 2017/12/10 09:24:30 snj Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.178.2.3 2018/01/02 10:20:34 snj Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -52,27 +52,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.
+ *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.178.2.2 2017/12/10 09:24:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.178.2.3 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #include "opt_compat_netbsd.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 @@ -218,51 +218,47 @@ ip6_init2(void)
 		      (ip6_temp_preferred_lifetime - ip6_desync_factor -
 		       ip6_temp_regen_advance) * hz,
 		      in6_tmpaddrtimer, NULL);
+}
 /*
  * IP6 input interrupt handling. Just pass the packet to ip6_input.
  */
 static void
 ip6intr(void *arg __unused)
+{
 	struct mbuf *m;
-#ifndef NET_MPSAFE
+	SOFTNET_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 #endif
 	while ((m = pktq_dequeue(ip6_pktq)) != NULL) {
 		struct psref psref;
 		struct ifnet *rcvif = m_get_rcvif_psref(m, &psref);
 		if (rcvif == NULL) {
 			m_freem(m);
 			continue;
+		}
 		/*
 		 * Drop the packet if IPv6 is disabled on the interface.
 		 */
 		if ((ND_IFINFO(rcvif)->flags & ND6_IFF_IFDISABLED)) {
 			m_put_rcvif_psref(rcvif, &psref);
 			m_freem(m);
 			continue;
+		}
 		ip6_input(m, rcvif);
 		m_put_rcvif_psref(rcvif, &psref);
+	}
-#ifndef NET_MPSAFE
+	SOFTNET_UNLOCK_UNLESS_NET_MPSAFE();
 	mutex_exit(softnet_lock);
 #endif
+}
 void
 ip6_input(struct mbuf *m, struct ifnet *rcvif)
+{
 	struct ip6_hdr *ip6;
 	int hit, off = sizeof(struct ip6_hdr), nest;
 	u_int32_t plen;
 	u_int32_t rtalert = ~0;
 	int nxt, ours = 0, rh_present = 0;
 	struct ifnet *deliverifp = NULL;
 	int srcrt = 0;
 	struct rtentry *rt = NULL;

--- src/sys/netinet6/ip6_output.c 2017/12/10 09:24:30	1.191.6.3
+++ src/sys/netinet6/ip6_output.c 2018/01/02 10:20:34	1.191.6.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip6_output.c,v 1.191.6.3 2017/12/10 09:24:30 snj Exp $	*/
+/*	$NetBSD: ip6_output.c,v 1.191.6.4 2018/01/02 10:20:34 snj Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -52,27 +52,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.
+ *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.191.6.3 2017/12/10 09:24:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.191.6.4 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -2596,37 +2596,40 @@ ip6_setmoptions(const struct sockopt *so
 			if (imm->i6mm_maddr->in6m_ifp == ifp &&
 			    IN6_ARE_ADDR_EQUAL(&imm->i6mm_maddr->in6m_addr,
 			    &ia))
 				goto put_break;
+		}
 		if (imm != NULL) {
 			error = EADDRINUSE;
 			goto put_break;
+		}
 		/*
 		 * Everything looks good; add a new record to the multicast
 		 * address list for the given interface.
 		 */
 		IFNET_LOCK(ifp);
 		imm = in6_joingroup(ifp, &ia, &error, 0);
 		IFNET_UNLOCK(ifp);
 		if (imm == NULL)
 			goto put_break;
 		LIST_INSERT_HEAD(&im6o->im6o_memberships, imm, i6mm_chain);
 	    put_break:
 		if_put(ifp, &psref);
 		curlwp_bindx(bound);
 		break;
+	    }
-	case IPV6_LEAVE_GROUP:
+	case IPV6_LEAVE_GROUP: {
 		struct ifnet *in6m_ifp;
 		/*
 		 * Drop a multicast group membership.
 		 * Group must be a valid IP6 multicast address.
 		 */
 		error = sockopt_get(sopt, &mreq, sizeof(mreq));
 		if (error != 0)
 			break;
 		if (IN6_IS_ADDR_V4MAPPED(&mreq.ipv6mr_multiaddr)) {
 			error = ip_setmoptions(&in6p->in6p_v4moptions, sopt);
 			break;
+		}
 		/*
 @@ -2688,28 +2691,33 @@ ip6_setmoptions(const struct sockopt *so
 			    &mreq.ipv6mr_multiaddr))
 				break;
+		}
 		if (imm == NULL) {
 			/* Unable to resolve interface */
 			error = EADDRNOTAVAIL;
 			break;
+		}
 		/*
 		 * Give up the multicast address record to which the
 		 * membership points.
 		 */
 		LIST_REMOVE(imm, i6mm_chain);
 		in6m_ifp = imm->i6mm_maddr->in6m_ifp;
 		IFNET_LOCK(in6m_ifp);
 		in6_leavegroup(imm);
 		/* in6m_ifp should not leave thanks to in6p_lock */
 		IFNET_UNLOCK(in6m_ifp);
 		break;
+	    }
 	default:
 		error = EOPNOTSUPP;
 		break;
+	}
 	/*
 	 * If all options have default values, no need to keep the mbuf.
 	 */
 	if (im6o->im6o_multicast_if_index == 0 &&
 	    im6o->im6o_multicast_hlim == ip6_defmcasthlim &&
 	    im6o->im6o_multicast_loop == IPV6_DEFAULT_MULTICAST_LOOP &&
 	    LIST_EMPTY(&im6o->im6o_memberships)) {
 @@ -2768,28 +2776,35 @@ ip6_getmoptions(struct sockopt *sopt, st
 /*
  * Discard the IP6 multicast options.
  */
 void
 ip6_freemoptions(struct ip6_moptions *im6o)
+{
 	struct in6_multi_mship *imm, *nimm;
 	if (im6o == NULL)
 		return;
 	/* The owner of im6o (in6p) should be protected by solock */
 	LIST_FOREACH_SAFE(imm, &im6o->im6o_memberships, i6mm_chain, nimm) {
 		struct ifnet *ifp;
 		LIST_REMOVE(imm, i6mm_chain);
 		ifp = imm->i6mm_maddr->in6m_ifp;
 		IFNET_LOCK(ifp);
 		in6_leavegroup(imm);
 		/* ifp should not leave thanks to solock */
 		IFNET_UNLOCK(ifp);
+	}
 	free(im6o, M_IPMOPTS);
+}
 /*
  * Set IPv6 outgoing packet options based on advanced API.
  */
 int
 ip6_setpktopts(struct mbuf *control, struct ip6_pktopts *opt,
 	struct ip6_pktopts *stickyopt, kauth_cred_t cred, int uproto)
+{
 	struct cmsghdr *cm = 0;

--- src/sys/netinet6/mld6.c 2017/05/13 20:13:26	1.89
+++ src/sys/netinet6/mld6.c 2018/01/02 10:20:34	1.89.2.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mld6.c,v 1.89 2017/05/13 20:13:26 kardel Exp $	*/
+/*	$NetBSD: mld6.c,v 1.89.2.1 2018/01/02 10:20:34 snj Exp $	*/
 /*	$KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $	*/
 /*
  * Copyright (C) 1998 WIDE Project.
  * 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
 @@ -92,27 +92,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.
+ *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.89 2017/05/13 20:13:26 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.89.2.1 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
 @@ -232,53 +232,45 @@ mld_stoptimer(struct in6_multi *in6m)
 	rw_enter(&in6_multilock, RW_WRITER);
 	in6m->in6m_timer = IN6M_TIMER_UNDEF;
+}
 static void
 mld_timeo(void *arg)
+{
 	struct in6_multi *in6m = arg;
 	KASSERT(in6m->in6m_refcount > 0);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	rw_enter(&in6_multilock, RW_WRITER);
 	if (in6m->in6m_timer == IN6M_TIMER_UNDEF)
 		goto out;
 	in6m->in6m_timer = IN6M_TIMER_UNDEF;
 	switch (in6m->in6m_state) {
 	case MLD_REPORTPENDING:
 		mld_start_listening(in6m);
 		break;
 	default:
 		mld_sendpkt(in6m, MLD_LISTENER_REPORT, NULL);
 		break;
+	}
 out:
 	rw_exit(&in6_multilock);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #else
 	return;
 #endif
+}
 static u_long
 mld_timerresid(struct in6_multi *in6m)
+{
 	struct timeval now, diff;
 	microtime(&now);
 	if (now.tv_sec > in6m->in6m_timer_expire.tv_sec ||
 	    (now.tv_sec == in6m->in6m_timer_expire.tv_sec &&
 	    now.tv_usec > in6m->in6m_timer_expire.tv_usec)) {
 		return (0);

--- src/sys/netinet6/nd6.c 2017/11/17 20:26:19	1.232.2.4
+++ src/sys/netinet6/nd6.c 2018/01/02 10:20:34	1.232.2.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nd6.c,v 1.232.2.4 2017/11/17 20:26:19 snj Exp $	*/
+/*	$NetBSD: nd6.c,v 1.232.2.5 2018/01/02 10:20:34 snj Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -21,27 +21,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.232.2.4 2017/11/17 20:26:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.232.2.5 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include "bridge.h"
 #include "carp.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 @@ -440,30 +440,27 @@ nd6_llinfo_get_holdsrc(struct llentry *l
 	return src;
+}
 static void
 nd6_llinfo_timer(void *arg)
+{
 	struct llentry *ln = arg;
 	struct ifnet *ifp;
 	struct nd_ifinfo *ndi = NULL;
 	bool send_ns = false;
 	const struct in6_addr *daddr6 = NULL;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	LLE_WLOCK(ln);
 	if ((ln->la_flags & LLE_LINKED) == 0)
 		goto out;
 	if (ln->ln_ntick > 0) {
 		nd6_llinfo_settimer(ln, ln->ln_ntick);
 		goto out;
+	}
 	if (callout_pending(&ln->la_timer)) {
 		/*
 		 * Here we are a bit odd here in the treatment of
 		 * active/pending. If the pending bit is set, it got
 		 * rescheduled before I ran. The active
 @@ -559,51 +556,45 @@ nd6_llinfo_timer(void *arg)
 		struct in6_addr src, *psrc;
 		const struct in6_addr *taddr6 = &ln->r_l3addr.addr6;
 		nd6_llinfo_settimer(ln, ndi->retrans * hz / 1000);
 		psrc = nd6_llinfo_get_holdsrc(ln, &src);
 		LLE_FREE_LOCKED(ln);
 		ln = NULL;
 		nd6_ns_output(ifp, daddr6, taddr6, psrc, 0);
+	}
 out:
 	if (ln != NULL)
 		LLE_FREE_LOCKED(ln);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 /*
  * ND6 timer routine to expire default route list and prefix list
  */
 static void
 nd6_timer_work(struct work *wk, void *arg)
+{
 	struct nd_defrouter *next_dr, *dr;
 	struct nd_prefix *next_pr, *pr;
 	struct in6_ifaddr *ia6, *nia6;
 	int s, bound;
 	struct psref psref;
 	callout_reset(&nd6_timer_ch, nd6_prune * hz,
 	    nd6_timer, NULL);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	/* expire default router list */
 	ND6_WLOCK();
 	ND_DEFROUTER_LIST_FOREACH_SAFE(dr, next_dr) {
 		if (dr->expire && dr->expire < time_uptime) {
 			nd6_defrtrlist_del(dr, NULL);
+		}
+	}
 	ND6_UNLOCK();
 	/*
 	 * expire interface addresses.
 @@ -613,46 +604,64 @@ nd6_timer_work(struct work *wk, void *ar
 	 */
 	bound = curlwp_bind();
   addrloop:
 	s = pserialize_read_enter();
 	for (ia6 = IN6_ADDRLIST_READER_FIRST(); ia6; ia6 = nia6) {
 		nia6 = IN6_ADDRLIST_READER_NEXT(ia6);
 		ia6_acquire(ia6, &psref);
 		pserialize_read_exit(s);
 		/* check address lifetime */
 		if (IFA6_IS_INVALID(ia6)) {
 			int regen = 0;
 			struct ifnet *ifp;
 			/*
 			 * If the expiring address is temporary, try
 			 * regenerating a new one.  This would be useful when
 			 * we suspended a laptop PC, then turned it on after a
 			 * period that could invalidate all temporary
 			 * addresses.  Although we may have to restart the
 			 * loop (see below), it must be after purging the
 			 * address.  Otherwise, we'd see an infinite loop of
 			 * regeneration.
 			 */
 			if (ip6_use_tempaddr &&
 			    (ia6->ia6_flags & IN6_IFF_TEMPORARY) != 0) {
 				IFNET_LOCK(ia6->ia_ifa.ifa_ifp);
 				if (regen_tmpaddr(ia6) == 0)
 					regen = 1;
 				IFNET_UNLOCK(ia6->ia_ifa.ifa_ifp);
+			}
-			ia6_release(ia6, &psref);
+			ifp = ia6->ia_ifa.ifa_ifp;
- 			in6_purgeaddr(&ia6->ia_ifa);
+			IFNET_LOCK(ifp);
 			/*
 			 * Need to take the lock first to prevent if_detach
 			 * from running in6_purgeaddr concurrently.
 			 */
 			if (!if_is_deactivated(ifp)) {
 				ia6_release(ia6, &psref);
 				in6_purgeaddr(&ia6->ia_ifa);
 			} else {
 				/*
 				 * ifp is being destroyed, ia6 will be destroyed
 				 * by if_detach.
 				 */
 				ia6_release(ia6, &psref);
+			}
 			ia6 = NULL;
 			IFNET_UNLOCK(ifp);
 			if (regen)
 				goto addrloop; /* XXX: see below */
 		} else if (IFA6_IS_DEPRECATED(ia6)) {
 			int oldflags = ia6->ia6_flags;
 			if ((oldflags & IN6_IFF_DEPRECATED) == 0) {
 				ia6->ia6_flags |= IN6_IFF_DEPRECATED;
 				rt_newaddrmsg(RTM_NEWADDR,
 				    (struct ifaddr *)ia6, 0, NULL);
+			}
 			/*
 @@ -707,30 +716,27 @@ nd6_timer_work(struct work *wk, void *ar
 		 */
 		if (pr->ndpr_vltime != ND6_INFINITE_LIFETIME &&
 		    time_uptime - pr->ndpr_lastupdate > pr->ndpr_vltime) {
 			/*
 			 * Just invalidate the prefix here. Removing it
 			 * will be done when purging an associated address.
 			 */
 			KASSERT(pr->ndpr_refcnt > 0);
 			nd6_invalidate_prefix(pr);
+		}
+	}
 	ND6_UNLOCK();
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 static void
 nd6_timer(void *ignored_arg)
+{
 	workqueue_enqueue(nd6_timer_wq, &nd6_timer_wk, NULL);
+}
 /* ia6: deprecated/invalidated temporary address */
 static int
 regen_tmpaddr(const struct in6_ifaddr *ia6)
+{
 @@ -1885,40 +1891,73 @@ nd6_ioctl(u_long cmd, void *data, struct
 	restart:
 		ND6_WLOCK();
 		ND_PREFIX_LIST_FOREACH_SAFE(pfx, next) {
 			struct in6_ifaddr *ia, *ia_next;
 			int _s;
 			if (IN6_IS_ADDR_LINKLOCAL(&pfx->ndpr_prefix.sin6_addr))
 				continue; /* XXX */
 			/* do we really have to remove addresses as well? */
 			_s = pserialize_read_enter();
 			for (ia = IN6_ADDRLIST_READER_FIRST(); ia;
 			     ia = ia_next) {
 				struct ifnet *ifa_ifp;
 				int bound;
 				struct psref psref;
 				/* ia might be removed.  keep the next ptr. */
 				ia_next = IN6_ADDRLIST_READER_NEXT(ia);
 				if ((ia->ia6_flags & IN6_IFF_AUTOCONF) == 0)
 					continue;
-				if (ia->ia6_ndpr == pfx) {
+				if (ia->ia6_ndpr != pfx)
-					pserialize_read_exit(_s);
+					continue;
 					ND6_UNLOCK();
-					/* XXX NOMPSAFE? */
+				bound = curlwp_bind();
-					/* in6_purgeaddr may destroy pfx. */
+				ia6_acquire(ia, &psref);
 				pserialize_read_exit(_s);
 				ND6_UNLOCK();
 				ifa_ifp = ia->ia_ifa.ifa_ifp;
 				if (ifa_ifp == ifp) {
 					/* Already have IFNET_LOCK(ifp) */
 					KASSERT(!if_is_deactivated(ifp));
 					ia6_release(ia, &psref);
 					in6_purgeaddr(&ia->ia_ifa);
 					curlwp_bindx(bound);
 					goto restart;
+				}
 				IFNET_LOCK(ifa_ifp);
 				/*
 				 * Need to take the lock first to prevent
 				 * if_detach from running in6_purgeaddr
 				 * concurrently.
 				 */
 				if (!if_is_deactivated(ifa_ifp)) {
 					ia6_release(ia, &psref);
 					in6_purgeaddr(&ia->ia_ifa);
 				} else {
 					/*
 					 * ifp is being destroyed, ia will be
 					 * destroyed by if_detach.
 					 */
 					ia6_release(ia, &psref);
 					/* XXX may cause busy loop */
+				}
 				IFNET_UNLOCK(ifa_ifp);
 				curlwp_bindx(bound);
 				goto restart;
+			}
 			pserialize_read_exit(_s);
 			KASSERT(pfx->ndpr_refcnt == 0);
 			nd6_prelist_remove(pfx);
+		}
 		ND6_UNLOCK();
 		break;
+	}
 	case SIOCSRTRFLUSH_IN6:
+	{
 		/* flush all the default routers */
 		struct nd_defrouter *drtr, *next;
 @@ -2218,54 +2257,48 @@ nd6_cache_lladdr(
 		ND6_WLOCK();
 		nd6_defrouter_select();
 		ND6_UNLOCK();
+	}
+}
 static void
 nd6_slowtimo(void *ignored_arg)
+{
 	struct nd_ifinfo *nd6if;
 	struct ifnet *ifp;
 	int s;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	callout_reset(&nd6_slowtimo_ch, ND6_SLOWTIMER_INTERVAL * hz,
 	    nd6_slowtimo, NULL);
 	s = pserialize_read_enter();
 	IFNET_READER_FOREACH(ifp) {
 		nd6if = ND_IFINFO(ifp);
 		if (nd6if->basereachable && /* already initialized */
 		    (nd6if->recalctm -= ND6_SLOWTIMER_INTERVAL) <= 0) {
 			/*
 			 * Since reachable time rarely changes by router
 			 * advertisements, we SHOULD insure that a new random
 			 * value gets recomputed at least once every few hours.
 			 * (RFC 2461, 6.3.4)
 			 */
 			nd6if->recalctm = nd6_recalc_reachtm_interval;
 			nd6if->reachable = ND_COMPUTE_RTIME(nd6if->basereachable);
+		}
+	}
 	pserialize_read_exit(s);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 /*
  * Return 0 if a neighbor cache is found. Return EWOULDBLOCK if a cache is not
  * found and trying to resolve a neighbor; in this case the mbuf is queued in
  * the list. Otherwise return errno after freeing the mbuf.
  */
 int
 nd6_resolve(struct ifnet *ifp, const struct rtentry *rt, struct mbuf *m,
     const struct sockaddr *_dst, uint8_t *lldst, size_t dstsize)
+{
 	struct llentry *ln = NULL;
 	bool created = false;

--- src/sys/netinet6/nd6_nbr.c 2017/03/14 04:25:10	1.138
+++ src/sys/netinet6/nd6_nbr.c 2018/01/02 10:20:34	1.138.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nd6_nbr.c,v 1.138 2017/03/14 04:25:10 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_nbr.c,v 1.138.6.1 2018/01/02 10:20:34 snj Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -21,27 +21,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138 2017/03/14 04:25:10 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138.6.1 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sockio.h>
 @@ -1218,30 +1218,27 @@ nd6_dad_stop(struct ifaddr *ifa)
 	kmem_intr_free(dp, sizeof(*dp));
 	ifafree(ifa);
+}
 static void
 nd6_dad_timer(struct ifaddr *ifa)
+{
 	struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa;
 	struct dadq *dp;
 	int duplicate = 0;
 	char ip6buf[INET6_ADDRSTRLEN];
 	bool need_free = false;
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
 #endif
 	mutex_enter(&nd6_dad_lock);
 	/* Sanity check */
 	if (ia == NULL) {
 		log(LOG_ERR, "nd6_dad_timer: called with null parameter\n");
 		goto done;
+	}
 	dp = nd6_dad_find(ifa);
 	if (dp == NULL) {
 		/* DAD seems to be stopping, so do nothing. */
 		goto done;
+	}
 	if (ia->ia6_flags & IN6_IFF_DUPLICATED) {
 @@ -1317,30 +1314,27 @@ nd6_dad_timer(struct ifaddr *ifa)
+	}
 done:
 	mutex_exit(&nd6_dad_lock);
 	if (need_free) {
 		kmem_intr_free(dp, sizeof(*dp));
 		ifafree(ifa);
 		ifa = NULL;
+	}
 	if (duplicate)
 		nd6_dad_duplicated(ifa);
-#ifndef NET_MPSAFE
+	SOFTNET_KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 #endif
+}
 static void
 nd6_dad_duplicated(struct ifaddr *ifa)
+{
 	struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa;
 	struct ifnet *ifp;
 	struct dadq *dp;
 	char ip6buf[INET6_ADDRSTRLEN];
 	mutex_enter(&nd6_dad_lock);
 	dp = nd6_dad_find(ifa);
 	if (dp == NULL) {

--- src/sys/netinet6/nd6_rtr.c 2017/03/14 04:21:38	1.135
+++ src/sys/netinet6/nd6_rtr.c 2018/01/02 10:20:34	1.135.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nd6_rtr.c,v 1.135 2017/03/14 04:21:38 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_rtr.c,v 1.135.6.1 2018/01/02 10:20:34 snj Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -21,27 +21,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.135 2017/03/14 04:21:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.135.6.1 2018/01/02 10:20:34 snj Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 @@ -309,26 +309,27 @@ nd6_ra_input(struct mbuf *m, int off, in
+		}
+	}
 	if (nd_ra->nd_ra_retransmit)
 		ndi->retrans = ntohl(nd_ra->nd_ra_retransmit);
 	if (nd_ra->nd_ra_curhoplimit) {
 		if (ndi->chlim < nd_ra->nd_ra_curhoplimit)
 			ndi->chlim = nd_ra->nd_ra_curhoplimit;
 		else if (ndi->chlim != nd_ra->nd_ra_curhoplimit)
 			log(LOG_ERR, "nd_ra_input: lower CurHopLimit sent from "
 			   "%s on %s (current=%d, received=%d), ignored\n",
 			   IN6_PRINT(ip6buf, &ip6->ip6_src),
 			   if_name(ifp), ndi->chlim, nd_ra->nd_ra_curhoplimit);
+	}
 	IFNET_LOCK(ifp);
 	ND6_WLOCK();
 	dr = defrtrlist_update(&drtr);
+    }
 	/*
 	 * prefix
 	 */
 	if (ndopts.nd_opts_pi) {
 		struct nd_opt_hdr *pt;
 		struct nd_opt_prefix_info *pi = NULL;
 		struct nd_prefixctl prc;
 		for (pt = (struct nd_opt_hdr *)ndopts.nd_opts_pi;
 @@ -368,26 +369,27 @@ nd6_ra_input(struct mbuf *m, int off, in
 			prc.ndprc_raf_onlink = (pi->nd_opt_pi_flags_reserved &
 			    ND_OPT_PI_FLAG_ONLINK) ? 1 : 0;
 			prc.ndprc_raf_auto = (pi->nd_opt_pi_flags_reserved &
 			    ND_OPT_PI_FLAG_AUTO) ? 1 : 0;
 			prc.ndprc_plen = pi->nd_opt_pi_prefix_len;
 			prc.ndprc_vltime = ntohl(pi->nd_opt_pi_valid_time);
 			prc.ndprc_pltime = ntohl(pi->nd_opt_pi_preferred_time);
 			(void)prelist_update(&prc, dr, m, mcast);
+		}
+	}
 	ND6_UNLOCK();
 	IFNET_UNLOCK(ifp);
 	/*
 	 * MTU
 	 */
 	if (ndopts.nd_opts_mtu && ndopts.nd_opts_mtu->nd_opt_mtu_len == 1) {
 		u_long mtu;
 		u_long maxmtu;
 		mtu = ntohl(ndopts.nd_opts_mtu->nd_opt_mtu_mtu);
 		/* lower bound */
 		if (mtu < IPV6_MMTU) {
 			nd6log(LOG_INFO, "bogus mtu option "

--- src/sys/netipsec/ipsec_output.c 2017/10/21 19:43:54	1.48.2.1
+++ src/sys/netipsec/ipsec_output.c 2018/01/02 10:20:34	1.48.2.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipsec_output.c,v 1.48.2.1 2017/10/21 19:43:54 snj Exp $	*/
+/*	$NetBSD: ipsec_output.c,v 1.48.2.2 2018/01/02 10:20:34 snj Exp $	*/
 /*-
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
  * 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.
 @@ -19,27 +19,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
+ *
  * $FreeBSD: /repoman/r/ncvs/src/sys/netipsec/ipsec_output.c,v 1.3.2.2 2003/03/28 20:32:53 sam Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.48.2.1 2017/10/21 19:43:54 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.48.2.2 2018/01/02 10:20:34 snj Exp $");
 /*
  * IPsec output processing.
  */
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 @@ -107,51 +107,47 @@ ipsec_register_done(struct mbuf *m, int
 	m_tag_prepend(m, mtag);
 	return 0;
+}
 static int
 ipsec_reinject_ipstack(struct mbuf *m, int af)
+{
 	int rv = -1;
 	struct route *ro;
 	KASSERT(af == AF_INET || af == AF_INET6);
-#ifndef NET_MPSAFE
+	KERNEL_LOCK_UNLESS_NET_MPSAFE();
 	KERNEL_LOCK(1, NULL);
 #endif
 	ro = percpu_getref(ipsec_rtcache_percpu);
 	switch (af) {
 #ifdef INET
 	case AF_INET:
 		rv = ip_output(m, NULL, ro, IP_RAWOUTPUT|IP_NOIPNEWID,
 		    NULL, NULL);
 		break;
 #endif
 #ifdef INET6
 	case AF_INET6:
 		/*
 		 * We don't need massage, IPv6 header fields are always in
 		 * net endian.
 		 */
 		rv = ip6_output(m, NULL, ro, 0, NULL, NULL, NULL);
 		break;
 #endif
+	}
 	percpu_putref(ipsec_rtcache_percpu);
-#ifndef NET_MPSAFE
+	KERNEL_UNLOCK_UNLESS_NET_MPSAFE();
 	KERNEL_UNLOCK_ONE(NULL);
 #endif
 	return rv;
+}
 int
 ipsec_process_done(struct mbuf *m, const struct ipsecrequest *isr,
     struct secasvar *sav)
+{
 	struct secasindex *saidx;
 	int error;
 #ifdef INET
 	struct ip * ip;
 #endif /* INET */

--- src/sys/rump/net/lib/libnetinet/netinet_component.c 2017/01/20 08:35:33	1.8
+++ src/sys/rump/net/lib/libnetinet/netinet_component.c 2018/01/02 10:20:34	1.8.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netinet_component.c,v 1.8 2017/01/20 08:35:33 ozaki-r Exp $	*/
+/*	$NetBSD: netinet_component.c,v 1.8.6.1 2018/01/02 10:20:34 snj Exp $	*/
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by The Nokia Foundation
+ *
  * 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
 @@ -18,27 +18,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.8 2017/01/20 08:35:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netinet_component.c,v 1.8.6.1 2018/01/02 10:20:34 snj Exp $");
 #include <sys/param.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/socketvar.h>
 #include <net/if.h>
 #include <net/netisr.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/if_inarp.h>
 @@ -84,17 +84,19 @@ RUMP_COMPONENT(RUMP_COMPONENT_NET_IFCFG)
 	sin->sin_len = sizeof(struct sockaddr_in);
 	sin->sin_addr.s_addr = inet_addr("127.0.0.1");
 	sin = (struct sockaddr_in *)&ia.ifra_mask;
 	sin->sin_family = AF_INET;
 	sin->sin_len = sizeof(struct sockaddr_in);
 	sin->sin_addr.s_addr = inet_addr("255.0.0.0");
 	sin = (struct sockaddr_in *)&ia.ifra_broadaddr;
 	sin->sin_family = AF_INET;
 	sin->sin_len = sizeof(struct sockaddr_in);
 	sin->sin_addr.s_addr = inet_addr("127.255.255.255");
 	IFNET_LOCK(lo0ifp);
 	in_control(so, SIOCAIFADDR, &ia, lo0ifp);
 	IFNET_UNLOCK(lo0ifp);
 	if_up(lo0ifp);
 	soclose(so);
+}