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

[Pyun YongHyeon]

Author: yongari
Date: Wed Mar 18 03:31:19 2009
New Revision: 189952
URL: http://svn.freebsd.org/changeset/base/189952

Log:
  MFC r189565:
    For unknown speed, explicitly set IFM_NONE.

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 03:29:05 2009	(r189951)
+++ stable/7/sys/dev/mii/ip1000phy.c	Wed Mar 18 03:31:19 2009	(r189952)
@@ -353,6 +353,9 @@ ip1000phy_status(struct mii_softc *sc)
 		case IP1000PHY_LSR_SPEED_1000:
 			mii->mii_media_active |= IFM_1000_T;
 			break;
+		default:
+			mii->mii_media_active |= IFM_NONE;
+			return;
 		}
 		if ((stat & IP1000PHY_LSR_FULL_DUPLEX) != 0)
 			mii->mii_media_active |= IFM_FDX;
@@ -373,6 +376,9 @@ ip1000phy_status(struct mii_softc *sc)
 		case PC_LinkSpeed_1000:
 			mii->mii_media_active |= IFM_1000_T;
 			break;
+		default:
+			mii->mii_media_active |= IFM_NONE;
+			return;
 		}
 		if ((stat & PC_PhyDuplexStatus) != 0)
 			mii->mii_media_active |= IFM_FDX;