 @@ -1,14 +1,14 @@
-/* $NetBSD: if_ie.c,v 1.34 2014/10/25 10:58:12 skrll Exp $ */
+/* $NetBSD: if_ie.c,v 1.35 2015/05/20 09:17:17 ozaki-r Exp $ */
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
  * All rights reserved.
+ *
  * This driver is a major hash up of src/sys/dev/isa/if_ie.c and
  * src/sys/arch/acorn32/podulebus/kgdb_ie.c  Please refer to copyright
  * notices from them too.
+ *
  * 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
 @@ -43,27 +43,27 @@
+ *
  * Created      : 26/06/95
  */
 /*
  *	This driver is at its last beta release.  It should not cause
  *	any problems (Touch wood)
+ *
  * 	If it passes field tests again.  This will constitute the realse
  *	version.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.34 2014/10/25 10:58:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.35 2015/05/20 09:17:17 ozaki-r Exp $");
 #define IGNORE_ETHER1_IDROM_CHECKSUM
 /* Standard podule includes */
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 @@ -84,31 +84,26 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 /* Import our data structres */
 #include "if_iereg.h"
 /* BPF support */
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 /* Some useful defines and macros */
 #define PODULE_IRQ_PENDING (1)
 #define NFRAMES	(16)		/* number of frame to allow for receive */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_es.c,v 1.52 2014/01/22 00:25:16 christos Exp $ */
+/*	$NetBSD: if_es.c,v 1.53 2015/05/20 09:17:17 ozaki-r Exp $ */
 /*
  * Copyright (c) 1995 Michael L. Hitch
  * 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,58 +23,53 @@
  * 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.
  */
 /*
  * SMC 91C90 Single-Chip Ethernet Controller
  */
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.52 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.53 2015/05/20 09:17:17 ozaki-r Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 #include <machine/cpu.h>
 #include <amiga/amiga/device.h>
 #include <amiga/amiga/isr.h>
 #include <amiga/dev/zbusvar.h>
 #include <amiga/dev/if_esreg.h>
 #define SWAP(x) (((x & 0xff) << 8) | ((x >> 8) & 0xff))
 #define	USEPKTBUF
 /*
  * Ethernet software status per interface.
+ *
 @@ -959,42 +954,26 @@ esioctl(struct ifnet *ifp, u_long cmd, v
 	switch (cmd) {
 	case SIOCINITIFADDR:
 		ifp->if_flags |= IFF_UP;
 		switch (ifa->ifa_addr->sa_family) {
 #ifdef INET
 		case AF_INET:
 			esinit(sc);
 			arp_ifinit(ifp, ifa);
 			break;
 #endif
 #ifdef NS
 		case AF_NS:
 			register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
 			if (ns_nullhost(*ina))
 				ina->x_host =
 				    *(union ns_host *)LLADDR(ifp->if_sadl);
 			else
 				bcopy(ina->x_host.c_host,
 				    LLADDR(ifp->if_sadl), ETHER_ADDR_LEN);
 			/* Set new address. */
 			esinit(sc);
 			break;
 #endif
 		default:
 			esinit(sc);
 			break;
+		}
 		break;
 	case SIOCSIFFLAGS:
 		if ((error = ifioctl_common(ifp, cmd, data)) != 0)
 			break;
 		/* XXX see the comment in ed_ioctl() about code re-use */
 		/*
 		 * If interface is marked down and it is running, then stop it
 		 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_qn.c,v 1.39 2012/10/27 17:17:29 chs Exp $ */
+/*	$NetBSD: if_qn.c,v 1.40 2015/05/20 09:17:17 ozaki-r Exp $ */
 /*
  * Copyright (c) 1995 Mika Kortelainen
  * 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.
 @@ -56,27 +56,27 @@
  *	All rights reserved.
+ *
  * - if_fe.c: some ideas for error handling for qn_rint() which might
  *	have fixed those random lock ups, too.
+ *
  *	All Rights Reserved, Copyright (C) Fujitsu Limited 1995
+ *
+ *
  * TODO:
  * - add multicast support
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.39 2012/10/27 17:17:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.40 2015/05/20 09:17:17 ozaki-r Exp $");
 #include "qn.h"
 #if NQN > 0
 #define QN_DEBUG
 #define QN_DEBUG1_no /* hides some old tests */
 #define QN_CHECKS_no /* adds some checks (not needed in normal situations) */
 /*
  * Fujitsu MB86950 Ethernet Controller (as used in the QuickNet QN2000
  * Ethernet card)
  */
 @@ -97,31 +97,26 @@ __KERNEL_RCSID(0, "$NetBSD: if_qn.c,v 1.
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 #include <machine/cpu.h>
 #include <amiga/amiga/device.h>
 #include <amiga/amiga/isr.h>
 #include <amiga/dev/zbusvar.h>
 #include <amiga/dev/if_qnreg.h>
 #define	NIC_R_MASK	(R_INT_PKT_RDY | R_INT_ALG_ERR |\
 			 R_INT_CRC_ERR | R_INT_OVR_FLO)
 #define	MAX_PACKETS	30 /* max number of packets read per interrupt */
 /*
  * Ethernet software status per interface
 @@ -818,42 +813,26 @@ qnioctl(register struct ifnet *ifp, u_lo
 	switch (cmd) {
 	case SIOCINITIFADDR:
 		ifp->if_flags |= IFF_UP;
 		switch (ifa->ifa_addr->sa_family) {
 #ifdef INET
 		case AF_INET:
 			qnstop(sc);
 			qninit(sc);
 			arp_ifinit(ifp, ifa);
 			break;
 #endif
 #ifdef NS
 		case AF_NS:
 			register struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
 			if (ns_nullhost(*ina))
 				ina->x_host =
 				    *(union ns_host *)LLADDR(ifp->if_sadl);
 			else
 				bcopy(ina->x_host.c_host,
 				    LLADDR(ifp->if_sadl), ETHER_ADDR_LEN);
 			qnstop(sc);
 			qninit(sc);
 			break;
 #endif
 		default:
 			log(LOG_INFO, "qn:sa_family:default (not tested)\n");
 			qnstop(sc);
 			qninit(sc);
 			break;
+		}
 		break;
 	case SIOCSIFFLAGS:
 		if ((error = ifioctl_common(ifp, cmd, data)) != 0)
 			break;
 		/* XXX see the comment in ed_ioctl() about code re-use */
 		if ((ifp->if_flags & IFF_UP) == 0 &&

 @@ -1,15 +1,15 @@
-/*	$Id: at91emac.c,v 1.13 2012/11/12 18:00:36 skrll Exp $	*/
+/*	$Id: at91emac.c,v 1.14 2015/05/20 09:17:17 ozaki-r Exp $	*/
-/*	$NetBSD: at91emac.c,v 1.13 2012/11/12 18:00:36 skrll Exp $	*/
+/*	$NetBSD: at91emac.c,v 1.14 2015/05/20 09:17:17 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2007 Embedtronics Oy
  * All rights reserved.
+ *
  * Based on arch/arm/ep93xx/epe.c
+ *
  * Copyright (c) 2004 Jesse Off
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -23,27 +23,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: at91emac.c,v 1.13 2012/11/12 18:00:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.14 2015/05/20 09:17:17 ozaki-r Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/time.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 @@ -58,31 +58,26 @@ __KERNEL_RCSID(0, "$NetBSD: at91emac.c,v
 #include <net/if_ether.h>
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 #ifdef IPKDB_AT91	// @@@
 #include <ipkdb/ipkdb.h>
 #endif
 #include <arm/at91/at91var.h>
 #include <arm/at91/at91emacreg.h>
 #include <arm/at91/at91emacvar.h>
 #define DEFAULT_MDCDIV	32

 @@ -1,14 +1,14 @@
-/*	$NetBSD: epe.c,v 1.31 2014/03/08 18:08:48 skrll Exp $	*/
+/*	$NetBSD: epe.c,v 1.32 2015/05/20 09:17:17 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2004 Jesse Off
  * 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 @@
  * ``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: epe.c,v 1.31 2014/03/08 18:08:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.32 2015/05/20 09:17:17 ozaki-r Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/time.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 @@ -55,31 +55,26 @@ __KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.31
 #include <net/if_ether.h>
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 #include <arm/ep93xx/ep93xxreg.h>
 #include <arm/ep93xx/epereg.h>
 #include <arm/ep93xx/epevar.h>
 #define DEFAULT_MDCDIV	32
 #ifndef EPE_FAST
 #define EPE_FAST
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ec.c,v 1.22 2015/04/13 21:18:42 riastradh Exp $	*/
+/*	$NetBSD: if_ec.c,v 1.23 2015/05/20 09:17:17 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
  */
 /*
  * 3Com 3C400 device driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.22 2015/04/13 21:18:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.23 2015/05/20 09:17:17 ozaki-r Exp $");
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 @@ -55,31 +55,26 @@ __KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.
 #include <net/if_types.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 #include <machine/cpu.h>
 #include <machine/autoconf.h>
 #include <machine/idprom.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <sun2/dev/if_ecreg.h>
 /*
  * Interface softc.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ie.c,v 1.55 2010/04/05 07:19:32 joerg Exp $ */
+/*	$NetBSD: if_ie.c,v 1.56 2015/05/20 09:17:17 ozaki-r Exp $ */
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.
  * Copyright (c) 1992, 1993, University of Vermont and State
  *  Agricultural College.
  * Copyright (c) 1992, 1993, Garrett A. Wollman.
+ *
  * Portions:
  * Copyright (c) 1994, 1995, Rafal K. Boni
  * Copyright (c) 1990, 1991, William F. Jolitz
  * Copyright (c) 1990, The Regents of the University of California
+ *
  * All rights reserved.
 @@ -88,27 +88,27 @@
    buffer rather than being split off into various fields in the RFD.
    This also means that we must include this header in the transmit
    buffer as well.
    By convention, all transmit commands, and only transmit commands,
    shall have the I (IE_CMD_INTR) bit set in the command.  This way,
    when an interrupt arrives at ieintr(), it is immediately possible
    to tell what precisely caused it.  ANY OTHER command-sending
    routines should run at splnet(), and should post an acknowledgement
    to every interrupt they generate.
 */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.55 2010/04/05 07:19:32 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.56 2015/05/20 09:17:17 ozaki-r Exp $");
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 @@ -120,31 +120,26 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.
 #include <net/if_ether.h>
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 #include <uvm/uvm_extern.h>
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
 #include <machine/pmap.h>
 /*
  * ugly byte-order hack for SUNs
  */
 #define XSWAP(y)	( (((y) & 0xff00) >> 8) | (((y) & 0xff) << 8) )
 #define SWAP(x)		((u_short)(XSWAP((u_short)(x))))
 @@ -1510,43 +1505,26 @@ ieioctl(struct ifnet *ifp, u_long cmd, v
 	switch (cmd) {
 	case SIOCINITIFADDR:
 		ifp->if_flags |= IFF_UP;
 		switch (ifa->ifa_addr->sa_family) {
 #ifdef INET
 		case AF_INET:
 			ieinit(sc);
 			arp_ifinit(ifp, ifa);
 			break;
 #endif
 #ifdef NS
 		/* XXX - This code is probably wrong. */
 		case AF_NS:
 			struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
 			if (ns_nullhost(*ina))
 				ina->x_host =
 				    *(union ns_host *)LLADDR(ifp->if_sadl);
 			else
 				memcpy(LLADDR(ifp->if_sadl),
 				    ina->x_host.c_host, ETHER_ADDR_LEN);
 			/* Set new address. */
 			ieinit(sc);
 			break;
 #endif /* NS */
 		default:
 			ieinit(sc);
 			break;
+		}
 		break;
 	case SIOCSIFFLAGS:
 		if ((error = ifioctl_common(ifp, cmd, data)) != 0)
 			break;
 		sc->promisc = ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI);
 		switch (ifp->if_flags & (IFF_UP|IFF_RUNNING)) {
 		case IFF_RUNNING:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ne_intio.c,v 1.17 2011/10/16 03:10:18 isaki Exp $	*/
+/*	$NetBSD: if_ne_intio.c,v 1.18 2015/05/20 09:17:18 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2001 Tetsuya Isaki. 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.
+ *
 @@ -20,56 +20,51 @@
  * 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.
  */
 /*
  * Ethernet part of Nereid Ethernet/USB/Memory board
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_intio.c,v 1.17 2011/10/16 03:10:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_intio.c,v 1.18 2015/05/20 09:17:18 ozaki-r Exp $");
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/select.h>
 #include <sys/device.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 #if BPFILTER > 0
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 #endif
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <dev/ic/dp8390reg.h>
 #include <dev/ic/dp8390var.h>
 #include <dev/ic/ne2000reg.h>
 #include <dev/ic/ne2000var.h>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ne_neptune.c,v 1.20 2010/03/03 13:39:57 tsutsui Exp $	*/
+/*	$NetBSD: if_ne_neptune.c,v 1.21 2015/05/20 09:17:18 ozaki-r Exp $	*/
 /*-
  * Copyright (c) 1997, 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
 @@ -21,27 +21,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_ne_neptune.c,v 1.20 2010/03/03 13:39:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_neptune.c,v 1.21 2015/05/20 09:17:18 ozaki-r Exp $");
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/select.h>
 #include <sys/device.h>
 @@ -49,31 +49,26 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_neptun
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 #include <machine/bus.h>
 #include <dev/ic/dp8390reg.h>
 #include <dev/ic/dp8390var.h>
 #include <dev/ic/ne2000reg.h>
 #include <dev/ic/ne2000var.h>
 #include <arch/x68k/dev/neptunevar.h>
 static int ne_neptune_match(device_t, cfdata_t, void *);
 static void ne_neptune_attach(device_t, device_t, void *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cemac.c,v 1.1 2015/01/23 12:34:09 hkenken Exp $	*/
+/*	$NetBSD: if_cemac.c,v 1.2 2015/05/20 09:17:18 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * Based on arch/arm/at91/at91emac.c
+ *
  * Copyright (c) 2007 Embedtronics Oy
  * All rights reserved.
+ *
  * Copyright (c) 2004 Jesse Off
  * All rights reserved.
+ *
 @@ -30,27 +30,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.
  */
 /*
  * Cadence EMAC/GEM ethernet controller IP driver
  * used by arm/at91, arm/zynq SoC
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.1 2015/01/23 12:34:09 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v 1.2 2015/05/20 09:17:18 ozaki-r Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/time.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 @@ -65,31 +65,26 @@ __KERNEL_RCSID(0, "$NetBSD: if_cemac.c,v
 #include <net/if_ether.h>
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/if_inarp.h>
 #endif
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
 #endif
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 #ifdef IPKDB_AT91	// @@@
 #include <ipkdb/ipkdb.h>
 #endif
 #include <dev/cadence/cemacreg.h>
 #include <dev/cadence/if_cemacvar.h>
 #define DEFAULT_MDCDIV	32
 #define CEMAC_READ(x) \

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ecosubr.c,v 1.41 2014/11/16 16:20:01 ozaki-r Exp $	*/
+/*	$NetBSD: if_ecosubr.c,v 1.42 2015/05/20 09:17:18 ozaki-r Exp $	*/
 /*-
  * Copyright (c) 2001 Ben Harris
  * 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.
 @@ -48,27 +48,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_ecosubr.c,v 1.41 2014/11/16 16:20:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.42 2015/05/20 09:17:18 ozaki-r Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 @@ -181,27 +181,27 @@ eco_output(struct ifnet *ifp, struct mbu
 	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
 		senderr(ENETDOWN);
 	if ((rt = rt0) != NULL) {
 		if ((rt->rt_flags & RTF_UP) == 0) {
 			if ((rt0 = rt = rtalloc1(dst, 1)) != NULL) {
 				rt->rt_refcnt--;
 				if (rt->rt_ifp != ifp)
 					return (*rt->rt_ifp->if_output)
 							(ifp, m0, dst, rt);
 			} else
 				senderr(EHOSTUNREACH);
+		}
-		if ((rt->rt_flags & RTF_GATEWAY) && dst->sa_family != AF_NS) {
+		if ((rt->rt_flags & RTF_GATEWAY)) {
 			if (rt->rt_gwroute == 0)
 				goto lookup;
 			if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
 				rtfree(rt); rt = rt0;
 			lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1);
 				if ((rt = rt->rt_gwroute) == 0)
 					senderr(EHOSTUNREACH);
 				/* the "G" test below also prevents rt == rt0 */
 				if ((rt->rt_flags & RTF_GATEWAY) ||
 				    (rt->rt_ifp != ifp)) {
 					rt->rt_refcnt--;
 					rt0->rt_gwroute = 0;
 					senderr(EHOSTUNREACH);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_hippisubr.c,v 1.41 2014/06/05 23:48:16 rmind Exp $	*/
+/*	$NetBSD: if_hippisubr.c,v 1.42 2015/05/20 09:17:18 ozaki-r Exp $	*/
 /*
  * Copyright (c) 1982, 1989, 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
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.41 2014/06/05 23:48:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hippisubr.c,v 1.42 2015/05/20 09:17:18 ozaki-r Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 @@ -102,27 +102,27 @@ hippi_output(struct ifnet *ifp, struct m
 	if (m->m_flags & (M_BCAST | M_MCAST))
 		senderr(EOPNOTSUPP);  /* XXX: some other error? */
 	if ((rt = rt0) != NULL) {
 		if ((rt->rt_flags & RTF_UP) == 0) {
 			if ((rt0 = rt = rtalloc1(dst, 1)) != NULL) {
 				rt->rt_refcnt--;
 				if (rt->rt_ifp != ifp)
 					return (*rt->rt_ifp->if_output)
 							(ifp, m0, dst, rt);
 			} else
 				senderr(EHOSTUNREACH);
+		}
-		if ((rt->rt_flags & RTF_GATEWAY) && dst->sa_family != AF_NS) {
+		if ((rt->rt_flags & RTF_GATEWAY)) {
 			if (rt->rt_gwroute == 0)
 				goto lookup;
 			if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
 				rtfree(rt); rt = rt0;
 			lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1);
 				if ((rt = rt->rt_gwroute) == 0)
 					senderr(EHOSTUNREACH);
 				/* the "G" test below also prevents rt == rt0 */
 				if ((rt->rt_flags & RTF_GATEWAY) ||
 				    (rt->rt_ifp != ifp)) {
 					rt->rt_refcnt--;
 					rt0->rt_gwroute = 0;
 					senderr(EHOSTUNREACH);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ethersubr.c,v 1.207 2015/04/13 22:46:57 riastradh Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.208 2015/05/20 09:17:18 ozaki-r 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.207 2015/04/13 22:46:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.208 2015/05/20 09:17:18 ozaki-r Exp $");
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #include "opt_ipx.h"
 #include "opt_mbuftrace.h"
 #include "opt_mpls.h"
 #include "opt_gateway.h"
 #include "opt_pppoe.h"
 #include "opt_net_mpsafe.h"
 #include "vlan.h"
 #include "pppoe.h"
 #include "bridge.h"
 #include "arp.h"
 @@ -245,27 +245,27 @@ ether_output(struct ifnet * const ifp0,
 	if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING))
 		senderr(ENETDOWN);
 	if ((rt = rt0) != NULL) {
 		if ((rt->rt_flags & RTF_UP) == 0) {
 			if ((rt0 = rt = rtalloc1(dst, 1)) != NULL) {
 				rt->rt_refcnt--;
 				if (rt->rt_ifp != ifp)
 					return (*rt->rt_ifp->if_output)
 							(ifp, m0, dst, rt);
 			} else
 				senderr(EHOSTUNREACH);
+		}
-		if ((rt->rt_flags & RTF_GATEWAY) && dst->sa_family != AF_NS) {
+		if ((rt->rt_flags & RTF_GATEWAY)) {
 			if (rt->rt_gwroute == NULL)
 				goto lookup;
 			if (((rt = rt->rt_gwroute)->rt_flags & RTF_UP) == 0) {
 				rtfree(rt); rt = rt0;
 			lookup: rt->rt_gwroute = rtalloc1(rt->rt_gateway, 1);
 				if ((rt = rt->rt_gwroute) == NULL)
 					senderr(EHOSTUNREACH);
 				/* the "G" test below also prevents rt == rt0 */
 				if ((rt->rt_flags & RTF_GATEWAY) ||
 				    (rt->rt_ifp != ifp)) {
 					rt->rt_refcnt--;
 					rt0->rt_gwroute = NULL;
 					senderr(EHOSTUNREACH);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_fddisubr.c,v 1.88 2014/06/07 09:34:02 martin Exp $	*/
+/*	$NetBSD: if_fddisubr.c,v 1.89 2015/05/20 09:17:18 ozaki-r 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.
 @@ -86,27 +86,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.
+ *
  *	@(#)if_fddisubr.c	8.1 (Berkeley) 6/10/93
+ *
  * Id: if_fddisubr.c,v 1.15 1997/03/21 22:35:50 thomas Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.88 2014/06/07 09:34:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.89 2015/05/20 09:17:18 ozaki-r Exp $");
 #include "opt_gateway.h"
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #include "opt_ipx.h"
 #include "opt_mbuftrace.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -452,30 +452,28 @@ bad:
+}
 /*
  * Process a received FDDI packet;
  * the packet is in the mbuf chain m with
  * the fddi header.
  */
 static void
 fddi_input(struct ifnet *ifp, struct mbuf *m)
+{
 #if defined(INET) || defined(INET6)
 	pktqueue_t *pktq = NULL;
 #endif
-#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(IPX) || defined(NETATALK)
 	struct ifqueue *inq = NULL;
 #endif
 #if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
 	int isr = 0;
 	int s;
 #endif
 	struct llc *l;
 	struct fddi_header *fh;
 	MCLAIM(m, &((struct ethercom *)ifp)->ec_rx_mowner);
 	if ((ifp->if_flags & IFF_UP) == 0) {
 		m_freem(m);
 		return;
+	}
 @@ -498,27 +496,27 @@ fddi_input(struct ifnet *ifp, struct mbu
 #ifdef M_LINK0
 	/*
 	 * If this has a LLC priority of 0, then mark it so upper
 	 * layers have a hint that it really came via a FDDI/Ethernet
 	 * bridge.
 	 */
 	if ((fh->fddi_fc & FDDIFC_LLC_PRIO7) == FDDIFC_LLC_PRIO0)
 		m->m_flags |= M_LINK0;
 #endif
 	l = (struct llc *)(fh+1);
 	switch (l->llc_dsap) {
-#if defined(INET) || defined(INET6) || defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(INET) || defined(INET6) || defined(DECNET) || defined(IPX) || defined(NETATALK)
 	case LLC_SNAP_LSAP:
+	{
 		uint16_t etype;
 		if (l->llc_control != LLC_UI || l->llc_ssap != LLC_SNAP_LSAP)
 			goto dropanyway;
 		/* Strip off the FDDI header. */
 		m_adj(m, sizeof(struct fddi_header));
 #ifdef NETATALK
 		if (memcmp(&(l->llc_snap_org_code)[0], at_org_code,
 			 sizeof(at_org_code)) == 0 &&
 		 	ntohs(l->llc_snap_ether_type) == ETHERTYPE_ATALK) {
 @@ -549,27 +547,27 @@ fddi_input(struct ifnet *ifp, struct mbu
 		switch (etype) {
 #ifdef INET
 		case ETHERTYPE_IP:
 #ifdef GATEWAY
 			if (ipflow_fastforward(m))
 				return;
 #endif
 			pktq = ip_pktq;
 			break;
 		case ETHERTYPE_ARP:
 #if !defined(__bsdi__) || _BSDI_VERSION >= 199401
-#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(IPX) || defined(NETATALK)
 			isr = NETISR_ARP;
 			inq = &arpintrq;
 #endif
 			break;
 #else
 			arpinput(ifp, m);
 			return;
 #endif
 #endif
 #ifdef IPX
 		case ETHERTYPE_IPX:
 			isr = NETISR_IPX;
 			inq = &ipxintrq;
 @@ -601,42 +599,42 @@ fddi_input(struct ifnet *ifp, struct mbu
 			aarpinput(ifp, m); /* XXX */
 			return;
 #endif /* NETATALK */
 		default:
 			ifp->if_noproto++;
 			goto dropanyway;
+		}
 		break;
+	}
 #endif /* INET || NS */
 	default:
 		ifp->if_noproto++;
-#if defined(INET) || defined(INET6) || defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(INET) || defined(INET6) || defined(DECNET) || defined(IPX) || defined(NETATALK)
 	dropanyway:
 #endif
 		m_freem(m);
 		return;
+	}
 #if defined(INET) || defined(INET6)
 	if (__predict_true(pktq)) {
 		if (__predict_false(!pktq_enqueue(pktq, m, 0))) {
 			m_freem(m);
+		}
 		return;
+	}
 #endif
-#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(DECNET) || defined(IPX) || defined(NETATALK)
 	if (!inq) {
 		m_freem(m);
+	}
 	s = splnet();
 	if (IF_QFULL(inq)) {
 		IF_DROP(inq);
 		m_freem(m);
 	} else {
 		IF_ENQUEUE(inq, m);
 		schednetisr(isr);
+	}
 	splx(s);
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_tokensubr.c,v 1.66 2014/11/28 08:29:00 ozaki-r Exp $	*/
+/*	$NetBSD: if_tokensubr.c,v 1.67 2015/05/20 09:17:18 ozaki-r Exp $	*/
 /*
  * Copyright (c) 1982, 1989, 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
  *    documentation and/or other materials provided with the distribution.
 @@ -82,27 +82,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.
+ *
  *	from: NetBSD: if_fddisubr.c,v 1.2 1995/08/19 04:35:29 cgd Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.66 2014/11/28 08:29:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.67 2015/05/20 09:17:18 ozaki-r Exp $");
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #include "opt_gateway.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 @@ -441,27 +441,27 @@ token_input(struct ifnet *ifp, struct mb
 	/* Skip past the Token Ring header and RIF. */
 	lan_hdr_len = sizeof(struct token_header);
 	if (trh->token_shost[0] & TOKEN_RI_PRESENT) {
 		struct token_rif *trrif;
 		trrif = TOKEN_RIF(trh);
 		lan_hdr_len += (ntohs(trrif->tr_rcf) & TOKEN_RCF_LEN_MASK) >> 8;
+	}
 	l = (struct llc *)(mtod(m, uint8_t *) + lan_hdr_len);
 	switch (l->llc_dsap) {
-#if defined(INET) || defined(NS) || defined(DECNET)
+#if defined(INET) || defined(DECNET)
 	case LLC_SNAP_LSAP:
+	{
 		uint16_t etype;
 		if (l->llc_control != LLC_UI || l->llc_ssap != LLC_SNAP_LSAP)
 			goto dropanyway;
 		if (l->llc_snap.org_code[0] != 0 ||
 		    l->llc_snap.org_code[1] != 0 ||
 		    l->llc_snap.org_code[2] != 0)
 			goto dropanyway;
 		etype = ntohs(l->llc_snap.ether_type);
 		m_adj(m, lan_hdr_len + LLC_SNAPFRAMELEN);
 #if NCARP > 0
 		if (ifp->if_carp && ifp->if_type != IFT_CARP &&
 @@ -491,27 +491,27 @@ token_input(struct ifnet *ifp, struct mb
 			/*
 			printf("token_input: unknown protocol 0x%x\n", etype);
 			*/
 			ifp->if_noproto++;
 			goto dropanyway;
+		}
 		break;
+	}
 #endif /* INET || NS || DECNET */
 	default:
 		/* printf("token_input: unknown dsap 0x%x\n", l->llc_dsap); */
 		ifp->if_noproto++;
-#if defined(INET) || defined(NS) || defined(DECNET)
+#if defined(INET) || defined(DECNET)
 	dropanyway:
 #endif
 		m_freem(m);
 		return;
+	}
 	if (__predict_true(pktq)) {
 		if (__predict_false(!pktq_enqueue(pktq, m, 0))) {
 			m_freem(m);
+		}
 		return;
+	}

 @@ -1,14 +1,14 @@
-/* $NetBSD: netisr.h,v 1.42 2013/03/01 18:25:57 joerg Exp $ */
+/* $NetBSD: netisr.h,v 1.43 2015/05/20 09:17:18 ozaki-r Exp $ */
 /*
  * Copyright (c) 1980, 1986, 1989, 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
  *    documentation and/or other materials provided with the distribution.
 @@ -92,27 +92,26 @@
 #endif
 #endif /* !defined(_LOCORE) */
 #endif /* defined(_KERNEL) */
 /*
  * Each ``pup-level-1'' input queue has a bit in a ``netisr'' status
  * word which is used to de-multiplex a single software
  * interrupt used for scheduling the network code to calls
  * on the lowest level routine of each protocol.
  */
 #define	NETISR_IP	2		/* same as AF_INET */
 #define	NETISR_NS	6		/* same as AF_NS */
 #define	NETISR_CCITT	10		/* same as AF_CCITT */
 #define	NETISR_ATALK	16		/* same as AF_APPLETALK */
 #define	NETISR_IPX	23		/* same as AF_IPX */
 #define	NETISR_IPV6	24		/* same as AF_INET6 */
 #define	NETISR_ISDN	26		/* same as AF_E164 */
 #define	NETISR_NATM	27		/* same as AF_NATM */
 #define	NETISR_ARP	28		/* same as AF_ARP */
 #define	NETISR_MPLS	33		/* same as AF_MPLS */
 #define	NETISR_MAX	AF_MAX
 #if !defined(_LOCORE) && defined(_KERNEL)
 /* XXX Legacy netisr support. */
 void	schednetisr(int);