svn commit: r229453 - in stable/8/sys: conf dev/dc

[Pyun YongHyeon]

Author: yongari
Date: Wed Jan  4 01:45:52 2012
New Revision: 229453
URL: http://svn.freebsd.org/changeset/base/229453

Log:
  MFC r227675:
    Partially revert r218788. r218788 removed calling dc_setcfg() for
    !DC_IS_ADMTEK in dc_miibus_statchg(). This change broke link
    establishment of Intel 21143 with dcphy(4) where it stuck in
    "ability detect" state without completing auto-negotiation.
    Also nuke dc_if_media as it's not actually used.

Modified:
  stable/8/sys/dev/dc/if_dc.c
  stable/8/sys/dev/dc/if_dcreg.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.32   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.64   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/dc/if_dc.c
==============================================================================
--- stable/8/sys/dev/dc/if_dc.c	Wed Jan  4 01:38:52 2012	(r229452)
+++ stable/8/sys/dev/dc/if_dc.c	Wed Jan  4 01:45:52 2012	(r229453)
@@ -860,12 +860,11 @@ dc_miibus_statchg(device_t dev)
 		return;
 
 	ifm = &mii->mii_media;
-	if (DC_IS_DAVICOM(sc) &&
-	    IFM_SUBTYPE(ifm->ifm_media) == IFM_HPNA_1) {
+	if (DC_IS_DAVICOM(sc) && IFM_SUBTYPE(ifm->ifm_media) == IFM_HPNA_1) {
 		dc_setcfg(sc, ifm->ifm_media);
-		sc->dc_if_media = ifm->ifm_media;
 		return;
-	}
+	} else if (!DC_IS_ADMTEK(sc))
+		dc_setcfg(sc, mii->mii_media_active);
 
 	sc->dc_link = 0;
 	if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
@@ -875,17 +874,8 @@ dc_miibus_statchg(device_t dev)
 		case IFM_100_TX:
 			sc->dc_link = 1;
 			break;
-		default:
-			break;
 		}
 	}
-	if (sc->dc_link == 0)
-		return;
-
-	sc->dc_if_media = mii->mii_media_active;
-	if (DC_IS_ADMTEK(sc))
-		return;
-	dc_setcfg(sc, mii->mii_media_active);
 }
 
 /*

Modified: stable/8/sys/dev/dc/if_dcreg.h
==============================================================================
--- stable/8/sys/dev/dc/if_dcreg.h	Wed Jan  4 01:38:52 2012	(r229452)
+++ stable/8/sys/dev/dc/if_dcreg.h	Wed Jan  4 01:45:52 2012	(r229453)
@@ -760,7 +760,6 @@ struct dc_softc {
 	int			dc_pnic_rx_bug_save;
 	unsigned char		*dc_pnic_rx_buf;
 	int			dc_if_flags;
-	int			dc_if_media;
 	uint32_t		dc_flags;
 	uint32_t		dc_txthresh;
 	uint32_t		dc_eaddr[2];