Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix one more bug I introduced in rev 1.21:

Browse Source 
Clear sc->sc_rx_consumed before allocating RX mbufs by vge_newbuf()
in vge_intr() otherwise vge_newbuf() might get KASSERT() failure
on DIAGNOSTIC kernel when the interface is reinitialized during RX.
This commit is contained in:
tsutsui 2007-06-12 14:32:36 +00:00
parent c6ee19e6af
commit 7be9269791
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/pci/if_vge.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_vge.c,v 1.34 2007/03/04 06:02:23 christos Exp $ */ /* $NetBSD: if_vge.c,v 1.35 2007/06/12 14:32:36 tsutsui Exp $ */
/*- /*-
* Copyright (c) 2004 * Copyright (c) 2004
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.34 2007/03/04 06:02:23 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.35 2007/06/12 14:32:36 tsutsui Exp $");
/* /*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver. * VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@ -1793,6 +1793,7 @@ vge_init(struct ifnet *ifp)
/* Initialize the RX descriptors and mbufs. */ /* Initialize the RX descriptors and mbufs. */
memset(sc->sc_rxdescs, 0, sizeof(sc->sc_rxdescs)); memset(sc->sc_rxdescs, 0, sizeof(sc->sc_rxdescs));
sc->sc_rx_consumed = 0;
for (i = 0; i < VGE_NRXDESC; i++) { for (i = 0; i < VGE_NRXDESC; i++) {
if (vge_newbuf(sc, i, NULL) == ENOBUFS) { if (vge_newbuf(sc, i, NULL) == ENOBUFS) {
aprint_error("%s: unable to allocate or map " aprint_error("%s: unable to allocate or map "
@ -1801,7 +1802,6 @@ vge_init(struct ifnet *ifp)
} }
} }
sc->sc_rx_prodidx = 0; sc->sc_rx_prodidx = 0;
sc->sc_rx_consumed = 0;
sc->sc_rx_mhead = sc->sc_rx_mtail = NULL; sc->sc_rx_mhead = sc->sc_rx_mtail = NULL;
/* Initialize the TX descriptors and mbufs. */ /* Initialize the TX descriptors and mbufs. */