[Glibc-bsd-commits] r3570 - branches/squeeze/kfreebsd-8/debian/patches

[Robert Millan]

Author: rmh
Date: 2011-07-11 18:30:35 +0000 (Mon, 11 Jul 2011)
New Revision: 3570

Modified:
   branches/squeeze/kfreebsd-8/debian/patches/000_msk_backport.diff
Log:
Remove a few adjustments to 8.2 API, which break build on 8.1 kfreebsd.

Modified: branches/squeeze/kfreebsd-8/debian/patches/000_msk_backport.diff
===================================================================
--- branches/squeeze/kfreebsd-8/debian/patches/000_msk_backport.diff	2011-07-11 16:28:45 UTC (rev 3569)
+++ branches/squeeze/kfreebsd-8/debian/patches/000_msk_backport.diff	2011-07-11 18:30:35 UTC (rev 3570)
@@ -103,32 +103,6 @@
  	sc_if = device_get_softc(dev);
  
  	return (msk_phy_writereg(sc_if, phy, reg, val));
-@@ -533,11 +533,11 @@
- 			break;
- 		}
- 
--		/* Disable Rx flow control. */
--		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FLAG0) == 0)
-+		if ((IFM_OPTIONS(mii->mii_media_active) &
-+		    IFM_ETH_RXPAUSE) == 0)
- 			gmac |= GM_GPCR_FC_RX_DIS;
--		/* Disable Tx flow control. */
--		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FLAG1) == 0)
-+		if ((IFM_OPTIONS(mii->mii_media_active) &
-+		     IFM_ETH_TXPAUSE) == 0)
- 			gmac |= GM_GPCR_FC_TX_DIS;
- 		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0)
- 			gmac |= GM_GPCR_DUP_FULL;
-@@ -549,7 +549,8 @@
- 		GMAC_READ_2(sc, sc_if->msk_port, GM_GP_CTRL);
- 		gmac = GMC_PAUSE_OFF;
- 		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0) {
--			if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FLAG0) != 0)
-+			if ((IFM_OPTIONS(mii->mii_media_active) &
-+			    IFM_ETH_RXPAUSE) != 0)
- 				gmac = GMC_PAUSE_ON;
- 		}
- 		CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, GMAC_CTRL), gmac);
 @@ -565,7 +566,7 @@
  		msk_phy_writereg(sc_if, PHY_ADDR_MARV, PHY_MARV_INT_MASK, 0);
  		/* Disable Rx/Tx MAC. */
@@ -537,21 +511,6 @@
  		 * if controller support new descriptor format.
  		 */
  		if ((sc_if->msk_flags & MSK_FLAG_DESCV2) != 0 &&
-@@ -1571,10 +1660,11 @@
- 	 * Do miibus setup.
- 	 */
- 	MSK_IF_UNLOCK(sc_if);
--	error = mii_phy_probe(dev, &sc_if->msk_miibus, msk_mediachange,
--	    msk_mediastatus);
-+	error = mii_attach(dev, &sc_if->msk_miibus, ifp, msk_mediachange,
-+	    msk_mediastatus, BMSR_DEFCAPMASK, PHY_ADDR_MARV, MII_OFFSET_ANY,
-+	    mmd->mii_flags);
- 	if (error != 0) {
--		device_printf(sc_if->msk_if_dev, "no PHY found!\n");
-+		device_printf(sc_if->msk_if_dev, "attaching PHYs failed\n");
- 		ether_ifdetach(ifp);
- 		error = ENXIO;
- 		goto fail;
 @@ -1634,13 +1724,15 @@
  		}
  	}
@@ -600,19 +559,6 @@
  	case CHIP_ID_YUKON_UL_2:
  		sc->msk_clock = 125;	/* 125 MHz */
  		sc->msk_pflags |= MSK_FLAG_JUMBO;
-@@ -1815,8 +1909,11 @@
- 	}
- 	mmd->port = MSK_PORT_A;
- 	mmd->pmd = sc->msk_pmd;
--	 if (sc->msk_pmd == 'L' || sc->msk_pmd == 'S' || sc->msk_pmd == 'P')
-+	mmd->mii_flags |= MIIF_DOPAUSE | MIIF_FORCEPAUSE;
-+	if (sc->msk_pmd == 'L' || sc->msk_pmd == 'S')
- 		mmd->mii_flags |= MIIF_HAVEFIBER;
-+	if (sc->msk_pmd == 'P')
-+		mmd->mii_flags |= MIIF_HAVEFIBER | MIIF_MACPRIV0;
- 	device_set_ivars(sc->msk_devs[MSK_PORT_A], mmd);
- 
- 	if (sc->msk_num_port > 1) {
 @@ -1826,7 +1923,8 @@
  			error = ENXIO;
  			goto fail;
@@ -623,18 +569,6 @@
  		if (mmd == NULL) {
  			device_printf(dev, "failed to allocate memory for "
  			    "ivars of PORT_B\n");
-@@ -1835,8 +1933,10 @@
- 		}
- 		mmd->port = MSK_PORT_B;
- 		mmd->pmd = sc->msk_pmd;
--	 	if (sc->msk_pmd == 'L' || sc->msk_pmd == 'S' || sc->msk_pmd == 'P')
-+		if (sc->msk_pmd == 'L' || sc->msk_pmd == 'S')
- 			mmd->mii_flags |= MIIF_HAVEFIBER;
-+		if (sc->msk_pmd == 'P')
-+			mmd->mii_flags |= MIIF_HAVEFIBER | MIIF_MACPRIV0;
- 		device_set_ivars(sc->msk_devs[MSK_PORT_B], mmd);
- 	}
- 
 @@ -2068,10 +2168,10 @@
  	 * what DMA address is used and chain another descriptor for the
  	 * 64bits DMA operation. This also means descriptor ring size is