kern/165032: commit references a PR

[dfilter service]

The following reply was made to PR kern/165032; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/165032: commit references a PR
Date: Sat, 25 Feb 2012 00:35:54 +0000 (UTC)

 Author: marius
 Date: Sat Feb 25 00:35:28 2012
 New Revision: 232135
 URL: http://svn.freebsd.org/changeset/base/232135
 
 Log:
   MFC: r231913
   
   - Probe BCM57780.
   - In case the parent is bge(4), don't set the Jumbo frame settings unless
     the MAC actually is Jumbo capable as otherwise the PHY might not have the
     corresponding registers implemented. This is also in line with what the
     Linux tg3 driver does.
   
   PR:		165032
   Submitted by:	Alexander Milanov
   Approved by:	re (kib)
   Obtained from:	OpenBSD
 
 Modified:
   stable/8/sys/dev/mii/brgphy.c
   stable/8/sys/dev/mii/miidevs
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/boot/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
   stable/8/sys/dev/e1000/   (props changed)
 
 Modified: stable/8/sys/dev/mii/brgphy.c
 ==============================================================================
 --- stable/8/sys/dev/mii/brgphy.c	Sat Feb 25 00:35:19 2012	(r232134)
 +++ stable/8/sys/dev/mii/brgphy.c	Sat Feb 25 00:35:28 2012	(r232135)
 @@ -145,6 +145,7 @@ static const struct mii_phydesc brgphys[
  	MII_PHY_DESC(xxBROADCOM_ALT2, BCM5719C),
  	MII_PHY_DESC(xxBROADCOM_ALT2, BCM5720C),
  	MII_PHY_DESC(xxBROADCOM_ALT2, BCM57765),
 +	MII_PHY_DESC(xxBROADCOM_ALT2, BCM57780),
  	MII_PHY_DESC(BROADCOM2, BCM5906),
  	MII_PHY_END
  };
 @@ -242,7 +243,8 @@ brgphy_attach(device_t dev)
  				sc->mii_flags |= MIIF_HAVEFIBER;
  			}
  			break;
 -		} break;
 +		}
 +		break;
  	case MII_OUI_xxBROADCOM_ALT1:
  		switch (bsc->mii_model) {
  		case MII_MODEL_xxBROADCOM_ALT1_BCM5708S:
 @@ -964,7 +966,8 @@ brgphy_reset(struct mii_softc *sc)
  		if (bge_sc->bge_phy_flags & BGE_PHY_JITTER_BUG)
  			brgphy_fixup_jitter_bug(sc);
  
 -		brgphy_jumbo_settings(sc, ifp->if_mtu);
 +		if (bge_sc->bge_flags & BGE_FLAG_JUMBO)
 +			brgphy_jumbo_settings(sc, ifp->if_mtu);
  
  		if ((bge_sc->bge_phy_flags & BGE_PHY_NO_WIRESPEED) == 0)
  			brgphy_ethernet_wirespeed(sc);
 
 Modified: stable/8/sys/dev/mii/miidevs
 ==============================================================================
 --- stable/8/sys/dev/mii/miidevs	Sat Feb 25 00:35:19 2012	(r232134)
 +++ stable/8/sys/dev/mii/miidevs	Sat Feb 25 00:35:28 2012	(r232135)
 @@ -157,6 +157,7 @@ model xxBROADCOM_ALT1 BCM5784	0x003a BCM
  model xxBROADCOM_ALT1 BCM5709C	0x003c BCM5709C 10/100/1000baseTX PHY
  model xxBROADCOM_ALT1 BCM5761	0x003d BCM5761 10/100/1000baseTX PHY
  model xxBROADCOM_ALT1 BCM5709S	0x003f BCM5709S 1000/2500baseSX PHY
 +model xxBROADCOM_ALT2 BCM57780	0x0019 BCM57780 1000BASE-T media interface
  model xxBROADCOM_ALT2 BCM5717C	0x0020 BCM5717C 10/100/1000baseTX PHY
  model xxBROADCOM_ALT2 BCM5719C	0x0022 BCM5719C 10/100/1000baseTX PHY
  model xxBROADCOM_ALT2 BCM57765	0x0024 BCM57765 10/100/1000baseTX PHY
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"