[src/trunk]: src/sys/dev/pci fix incorrect KASSERT

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

details:   https://anonhg.NetBSD.org/src/rev/3c10fe3d2aad
branches:  trunk
changeset: 342433:3c10fe3d2aad
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Tue Dec 22 02:10:25 2015 +0000

description:
fix incorrect KASSERT

diffstat:

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

diffs (47 lines):

diff -r decb30cc1ccb -r 3c10fe3d2aad sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Tue Dec 22 01:59:21 2015 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Dec 22 02:10:25 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.383 2015/12/18 09:57:57 knakahara Exp $    */
+/*     $NetBSD: if_wm.c,v 1.384 2015/12/22 02:10:25 knakahara Exp $    */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.383 2015/12/18 09:57:57 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.384 2015/12/22 02:10:25 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -9321,12 +9321,11 @@
 static void
 wm_tbi_tick(struct wm_softc *sc)
 {
-       struct wm_txqueue *txq __diagused = &sc->sc_txq[0];
        struct mii_data *mii = &sc->sc_mii;
        struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
        uint32_t status;
 
-       KASSERT(WM_TX_LOCKED(txq));
+       KASSERT(WM_CORE_LOCKED(sc));
 
        status = CSR_READ(sc, WMREG_STATUS);
 
@@ -9529,13 +9528,12 @@
 static void
 wm_serdes_tick(struct wm_softc *sc)
 {
-       struct wm_txqueue *txq __diagused = &sc->sc_txq[0];
        struct ifnet *ifp = &sc->sc_ethercom.ec_if;
        struct mii_data *mii = &sc->sc_mii;
        struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
        uint32_t reg;
 
-       KASSERT(WM_TX_LOCKED(txq));
+       KASSERT(WM_CORE_LOCKED(sc));
 
        mii->mii_media_status = IFM_AVALID;
        mii->mii_media_active = IFM_ETHER;