[src/trunk]: src/sys/net Do KASSERT(KERNEL_LOCKED_P()) only when NET_MPSAFE off

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/932a793c2d91
branches:  trunk
changeset: 332780:932a793c2d91
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Oct 09 04:48:12 2014 +0000

description:
Do KASSERT(KERNEL_LOCKED_P()) only when NET_MPSAFE off

When NET_MPSAFE, bridge_enqueue calls vlan_start w/o KERNEL_LOCK.

diffstat:

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

diffs (28 lines):

diff -r b35f0bb074f6 -r 932a793c2d91 sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Wed Oct 08 22:10:04 2014 +0000
+++ b/sys/net/if_vlan.c Thu Oct 09 04:48:12 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vlan.c,v 1.74 2014/09/15 06:07:37 ozaki-r Exp $     */
+/*     $NetBSD: if_vlan.c,v 1.75 2014/10/09 04:48:12 ozaki-r Exp $     */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.74 2014/09/15 06:07:37 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.75 2014/10/09 04:48:12 ozaki-r Exp $");
 
 #include "opt_inet.h"
 
@@ -695,7 +695,9 @@
        int error;
        ALTQ_DECL(struct altq_pktattr pktattr;)
 
+#ifndef NET_MPSAFE
        KASSERT(KERNEL_LOCKED_P());
+#endif
 
        ifp->if_flags |= IFF_OACTIVE;