Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci fix r1.492 bug, sorry



details:   https://anonhg.NetBSD.org/src/rev/97a2753147d0
branches:  trunk
changeset: 822142:97a2753147d0
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Fri Mar 03 16:48:55 2017 +0000

description:
fix r1.492 bug, sorry

diffstat:

 sys/dev/pci/if_wm.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 8641cad8a242 -r 97a2753147d0 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Mar 03 12:23:26 2017 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Mar 03 16:48:55 2017 +0000
@@ -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 @@
        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 @@
        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.
         */



Home | Main Index | Thread Index | Old Index