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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
