svn commit: r201878 - stable/7/sys/dev/mii

[Pyun YongHyeon]

Author: yongari
Date: Sat Jan  9 01:20:01 2010
New Revision: 201878
URL: http://svn.freebsd.org/changeset/base/201878

Log:
  MFC r200693:
    Make sure to enable Next Page bit for IP1001. Otherwise the PHY
    fails to re-establishe 1000baseT link after downgrading to
    10/100Mbps link.

Modified:
  stable/7/sys/dev/mii/ip1000phy.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mii/ip1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/ip1000phy.c	Sat Jan  9 01:17:31 2010	(r201877)
+++ stable/7/sys/dev/mii/ip1000phy.c	Sat Jan  9 01:20:01 2010	(r201878)
@@ -398,8 +398,10 @@ ip1000phy_mii_phy_auto(struct mii_softc 
 
 	isc = (struct ip1000phy_softc *)sc;
 	reg = 0;
-	if (isc->model == MII_MODEL_ICPLUS_IP1001)
+	if (isc->model == MII_MODEL_ICPLUS_IP1001) {
 		reg = PHY_READ(sc, IP1000PHY_MII_ANAR);
+		reg |= IP1000PHY_ANAR_NP;
+	}
 	reg |= IP1000PHY_ANAR_10T | IP1000PHY_ANAR_10T_FDX |
 	    IP1000PHY_ANAR_100TX | IP1000PHY_ANAR_100TX_FDX |
 	    IP1000PHY_ANAR_PAUSE | IP1000PHY_ANAR_APAUSE;