svn commit: r189951 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/mii

[Pyun YongHyeon]

Author: yongari
Date: Wed Mar 18 03:29:05 2009
New Revision: 189951
URL: http://svn.freebsd.org/changeset/base/189951

Log:
  MFC r189564:
    Report current link state while auto-negotiation is in progress.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/mii/ip1000phy.c

Modified: stable/7/sys/dev/mii/ip1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/ip1000phy.c	Wed Mar 18 02:38:35 2009	(r189950)
+++ stable/7/sys/dev/mii/ip1000phy.c	Wed Mar 18 03:29:05 2009	(r189951)
@@ -296,7 +296,7 @@ done:
 		 * Only retry autonegotiation every mii_anegticks seconds.
 		 */
 		if (sc->mii_ticks <= sc->mii_anegticks)
-			return (0);
+			break;
 
 		sc->mii_ticks = 0;
 		ip1000phy_mii_phy_auto(sc);