diff options
| author | yongari <yongari@FreeBSD.org> | 2009-12-08 03:24:29 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2009-12-08 03:24:29 +0000 |
| commit | 1728f779ed4215aeeb3b80f921a21c1c070d3678 (patch) | |
| tree | cf258e46d727132bb7db3ed23d1ea4fc06460dc6 /sys | |
| parent | fe4debf5259516d09b353ac063fdd9b779ecb35c (diff) | |
| download | FreeBSD-src-1728f779ed4215aeeb3b80f921a21c1c070d3678.zip FreeBSD-src-1728f779ed4215aeeb3b80f921a21c1c070d3678.tar.gz | |
Partially revert r200228. For mini RCB case, bge(4) still have to
disable mini ring withtout regard to mini ring support.
Reported by: marcel
Tested by: marcel
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/bge/if_bge.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index f948bd7..1fc350f 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -1618,13 +1618,11 @@ bge_blockinit(struct bge_softc *sc) CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_NICADDR, rcb->bge_nicaddr); /* Set up dummy disabled mini ring RCB */ - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) { - rcb = &sc->bge_ldata.bge_info.bge_mini_rx_rcb; - rcb->bge_maxlen_flags = - BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_RING_DISABLED); - CSR_WRITE_4(sc, BGE_RX_MINI_RCB_MAXLEN_FLAGS, - rcb->bge_maxlen_flags); - } + rcb = &sc->bge_ldata.bge_info.bge_mini_rx_rcb; + rcb->bge_maxlen_flags = + BGE_RCB_MAXLEN_FLAGS(0, BGE_RCB_FLAG_RING_DISABLED); + CSR_WRITE_4(sc, BGE_RX_MINI_RCB_MAXLEN_FLAGS, + rcb->bge_maxlen_flags); } /* |
