svn commit: r213970 - stable/7/sys/dev/mii

[Marius Strobl]

Author: marius
Date: Sun Oct 17 13:11:46 2010
New Revision: 213970
URL: http://svn.freebsd.org/changeset/base/213970

Log:
  MFC: r185421
  
  Renamed the FRAMELEN macro to TRUEPHY_FRAMELEN as for powerpc
  it seems to be possible to collide with FRAMELEN from machine/frame.h.
  
  Found by:	zec

Modified:
  stable/7/sys/dev/mii/truephy.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mii/truephy.c
==============================================================================
--- stable/7/sys/dev/mii/truephy.c	Sun Oct 17 13:10:22 2010	(r213969)
+++ stable/7/sys/dev/mii/truephy.c	Sun Oct 17 13:11:46 2010	(r213970)
@@ -57,7 +57,8 @@
 
 #include "miibus_if.h"
 
-#define FRAMELEN(mtu)	(ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN + (mtu) + ETHER_CRC_LEN)
+#define	TRUEPHY_FRAMELEN(mtu)	\
+    (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN + (mtu) + ETHER_CRC_LEN)
 
 static int	truephy_service(struct mii_softc *, struct mii_data *, int);
 static int	truephy_attach(device_t);
@@ -302,7 +303,7 @@ truephy_reset(struct mii_softc *sc)
 
 	mii_phy_reset(sc);
 
-	if (FRAMELEN(sc->mii_pdata->mii_ifp->if_mtu) > 2048) {
+	if (TRUEPHY_FRAMELEN(sc->mii_pdata->mii_ifp->if_mtu) > 2048) {
 		int conf;
 
 		conf = PHY_READ(sc, TRUEPHY_CONF);