Date: Tue, 8 Dec 2009 03:24:29 +0000 (UTC) From: Pyun YongHyeon <yongari@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r200246 - head/sys/dev/bge Message-ID: <200912080324.nB83OTNc074556@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yongari Date: Tue Dec 8 03:24:29 2009 New Revision: 200246 URL: http://svn.freebsd.org/changeset/base/200246 Log: 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 Modified: head/sys/dev/bge/if_bge.c Modified: head/sys/dev/bge/if_bge.c ============================================================================== --- head/sys/dev/bge/if_bge.c Tue Dec 8 01:56:59 2009 (r200245) +++ head/sys/dev/bge/if_bge.c Tue Dec 8 03:24:29 2009 (r200246) @@ -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); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912080324.nB83OTNc074556>