From 5e2f96bf699e11f1c1f676dc2d8d9246d42866a5 Mon Sep 17 00:00:00 2001 From: Pyun YongHyeon Date: Tue, 12 Oct 2010 19:22:03 +0000 Subject: [PATCH] Fix a regression introduced in r213495. r213495 disabled mini receive producer ring only for BCM5700. It was believed that BCM5700 with external SSRAM is the only controller that supports mini ring but it seems all BCM570[0-4] requires to disable mini receive producer ring. Otherwise, it caused unexpected RX DMA error or watchdog timeouts. Reported by: marius, Steve Kargl troutmask dot apl dot washington dot edu> Tested by: marius, Steve Kargl troutmask dot apl dot washington dot edu> --- sys/dev/bge/if_bge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index a439ad3fb40..5ced81fb1ed 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -1655,7 +1655,7 @@ bge_blockinit(struct bge_softc *sc) } /* Disable the mini receive producer ring RCB. */ - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) { + if (BGE_IS_5700_FAMILY(sc)) { rcb = &sc->bge_ldata.bge_info.bge_mini_rx_rcb; rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_RING_DISABLED);