From owner-svn-src-all@FreeBSD.ORG  Sun Oct 24 20:54:47 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F37171065670;
	Sun, 24 Oct 2010 20:54:46 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E21D78FC08;
	Sun, 24 Oct 2010 20:54:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9OKskCY039636;
	Sun, 24 Oct 2010 20:54:46 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9OKsk5r039634;
	Sun, 24 Oct 2010 20:54:46 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201010242054.o9OKsk5r039634@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Sun, 24 Oct 2010 20:54:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214292 - head/sys/dev/bge
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Oct 2010 20:54:47 -0000

Author: yongari
Date: Sun Oct 24 20:54:46 2010
New Revision: 214292
URL: http://svn.freebsd.org/changeset/base/214292

Log:
  Use bge_chipid to compare controller ids. r214251 incorrectly used
  bge_chiprev.
  
  Reported by:	Buganini <buganini <> gmail dot com >

Modified:
  head/sys/dev/bge/if_bge.c

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Sun Oct 24 20:45:13 2010	(r214291)
+++ head/sys/dev/bge/if_bge.c	Sun Oct 24 20:54:46 2010	(r214292)
@@ -1695,9 +1695,9 @@ bge_blockinit(struct bge_softc *sc)
 
 	/* Choose de-pipeline mode for BCM5906 A0, A1 and A2. */
 	if (sc->bge_asicrev == BGE_ASICREV_BCM5906) {
-		if (sc->bge_chiprev == BGE_CHIPID_BCM5906_A0 ||
-		    sc->bge_chiprev == BGE_CHIPID_BCM5906_A1 ||
-		    sc->bge_chiprev == BGE_CHIPID_BCM5906_A2)
+		if (sc->bge_chipid == BGE_CHIPID_BCM5906_A0 ||
+		    sc->bge_chipid == BGE_CHIPID_BCM5906_A1 ||
+		    sc->bge_chipid == BGE_CHIPID_BCM5906_A2)
 			CSR_WRITE_4(sc, BGE_ISO_PKT_TX,
 			    (CSR_READ_4(sc, BGE_ISO_PKT_TX) & ~3) | 2);
 	}