From owner-svn-src-head@FreeBSD.ORG  Wed Oct 20 09:50:11 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D935B1065670;
	Wed, 20 Oct 2010 09:50:11 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C71308FC14;
	Wed, 20 Oct 2010 09:50:11 +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 o9K9oBN9044883;
	Wed, 20 Oct 2010 09:50:11 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9K9oBEb044880;
	Wed, 20 Oct 2010 09:50:11 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201010200950.o9K9oBEb044880@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Wed, 20 Oct 2010 09:50:11 +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: r214107 - in head/sys/mips/rmi: . dev/nlge
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Oct 2010 09:50:11 -0000

Author: jchandra
Date: Wed Oct 20 09:50:11 2010
New Revision: 214107
URL: http://svn.freebsd.org/changeset/base/214107

Log:
  Network driver updates
  - Fix network driver issue on a XLS eval board (major# 8).
  - Fix issue uncovered by r213475 in check for XGMII
  
  Submitted by:	Sriram Gorti (srgorti at netlogicmicro dot com)

Modified:
  head/sys/mips/rmi/board.c
  head/sys/mips/rmi/dev/nlge/if_nlge.c

Modified: head/sys/mips/rmi/board.c
==============================================================================
--- head/sys/mips/rmi/board.c	Wed Oct 20 09:41:36 2010	(r214106)
+++ head/sys/mips/rmi/board.c	Wed Oct 20 09:50:11 2010	(r214107)
@@ -283,14 +283,14 @@ xls_board_specific_overrides(struct xlr_
 		break;
 
 	case RMI_XLR_BOARD_ARIZONA_VIII:
-
-		if (blk1->enabled) { 
+		if (blk1->enabled) {
 			/* There is just one Octal PHY on the board and it is 
 			 * connected to the MII interface for NA Quad 0. */
-			blk1->gmac_port[0].mii_addr = XLR_IO_GMAC_0_OFFSET;
-			blk1->gmac_port[1].mii_addr = XLR_IO_GMAC_0_OFFSET;
-			blk1->gmac_port[2].mii_addr = XLR_IO_GMAC_0_OFFSET;
-			blk1->gmac_port[3].mii_addr = XLR_IO_GMAC_0_OFFSET;
+			for (i = 0; i < 4; i++) { 
+				blk1->gmac_port[i].mii_addr =
+				    XLR_IO_GMAC_0_OFFSET; 
+				blk1->gmac_port[i].mdint_id = 0; 
+			} 
 		}
 		break;
 

Modified: head/sys/mips/rmi/dev/nlge/if_nlge.c
==============================================================================
--- head/sys/mips/rmi/dev/nlge/if_nlge.c	Wed Oct 20 09:41:36 2010	(r214106)
+++ head/sys/mips/rmi/dev/nlge/if_nlge.c	Wed Oct 20 09:50:11 2010	(r214107)
@@ -861,7 +861,7 @@ nlge_mii_read(struct device *dev, int ph
 	int val;
 
 	sc = device_get_softc(dev);
-	val = (sc->port_type != XLR_XGMII) ? (0xffff) :
+	val = (sc->port_type == XLR_XGMII) ? (0xffff) :
 	    nlge_mii_read_internal(sc->mii_base, phyaddr, regidx);
 
 	return (val);