[src/netbsd-8]: src/sys/net Pull up following revision(s) (requested by ozaki...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5fc84f2f7449
branches:  netbsd-8
changeset: 851086:5fc84f2f7449
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Oct 25 07:12:33 2017 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #328):
        sys/net/if_vlan.c: revision 1.103
Set IFEF_START_MPSAFE by default
Because vlan_start is already MP-safe, there is no reason to not do so.
Acked by s-yamaguchi@IIJ

diffstat:

 sys/net/if_vlan.c |  15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diffs (54 lines):

diff -r c0f2f1bad3b9 -r 5fc84f2f7449 sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Wed Oct 25 07:08:45 2017 +0000
+++ b/sys/net/if_vlan.c Wed Oct 25 07:12:33 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vlan.c,v 1.97.2.3 2017/10/24 08:38:59 snj Exp $     */
+/*     $NetBSD: if_vlan.c,v 1.97.2.4 2017/10/25 07:12:33 snj Exp $     */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,11 +78,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.3 2017/10/24 08:38:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.97.2.4 2017/10/25 07:12:33 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
-#include "opt_net_mpsafe.h"
 #endif
 
 #include <sys/param.h>
@@ -123,10 +122,6 @@
 
 #include "ioconf.h"
 
-#ifdef NET_MPSAFE
-#define VLAN_MPSAFE            1
-#endif
-
 struct vlan_mc_entry {
        LIST_ENTRY(vlan_mc_entry)       mc_entries;
        /*
@@ -342,9 +337,7 @@
        if_initname(ifp, ifc->ifc_name, unit);
        ifp->if_softc = ifv;
        ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-#ifdef VLAN_MPSAFE
        ifp->if_extflags = IFEF_START_MPSAFE;
-#endif
        ifp->if_start = vlan_start;
        ifp->if_transmit = vlan_transmit;
        ifp->if_ioctl = vlan_ioctl;
@@ -1183,10 +1176,6 @@
        struct psref psref;
        int error;
 
-#ifndef NET_MPSAFE
-       KASSERT(KERNEL_LOCKED_P());
-#endif
-
        mib = vlan_getref_linkmib(ifv, &psref);
        if (mib == NULL)
                return;