Module Name: src
Committed By: knakahara
Date: Fri Mar 3 16:48:55 UTC 2017
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
fix r1.492 bug, sorry
To generate a diff of this commit:
cvs rdiff -u -r1.495 -r1.496 src/sys/dev/pci/if_wm.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/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.495 src/sys/dev/pci/if_wm.c:1.496
--- src/sys/dev/pci/if_wm.c:1.495 Fri Mar 3 07:57:49 2017
+++ src/sys/dev/pci/if_wm.c Fri Mar 3 16:48:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.495 2017/03/03 07:57:49 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.496 2017/03/03 16:48:55 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.495 2017/03/03 07:57:49 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.496 2017/03/03 16:48:55 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -6619,8 +6619,9 @@ 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);
-
+#endif
/*
* ifp->if_obytes and ifp->if_omcasts are added in if_transmit()@if.c.
*/
@@ -7205,8 +7206,9 @@ 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);
-
+#endif
/*
* ifp->if_obytes and ifp->if_omcasts are added in if_transmit()@if.c.
*/
