Module Name: src
Committed By: ozaki-r
Date: Thu Oct 9 04:48:12 UTC 2014
Modified Files:
src/sys/net: if_vlan.c
Log Message:
Do KASSERT(KERNEL_LOCKED_P()) only when NET_MPSAFE off
When NET_MPSAFE, bridge_enqueue calls vlan_start w/o KERNEL_LOCK.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/net/if_vlan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.74 src/sys/net/if_vlan.c:1.75
--- src/sys/net/if_vlan.c:1.74 Mon Sep 15 06:07:37 2014
+++ src/sys/net/if_vlan.c Thu Oct 9 04:48:12 2014
@@ -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 @@ vlan_start(struct ifnet *ifp)
int error;
ALTQ_DECL(struct altq_pktattr pktattr;)
+#ifndef NET_MPSAFE
KASSERT(KERNEL_LOCKED_P());
+#endif
ifp->if_flags |= IFF_OACTIVE;
