From owner-svn-src-stable@FreeBSD.ORG  Sun Oct 17 13:11:46 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE6741065693;
	Sun, 17 Oct 2010 13:11:46 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DB9478FC1A;
	Sun, 17 Oct 2010 13:11:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9HDBkra031882;
	Sun, 17 Oct 2010 13:11:46 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9HDBkO0031880;
	Sun, 17 Oct 2010 13:11:46 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201010171311.o9HDBkO0031880@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 17 Oct 2010 13:11:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213970 - stable/7/sys/dev/mii
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Oct 2010 13:11:47 -0000

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);