Date: Fri, 28 Nov 2008 23:44:13 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r185421 - head/sys/dev/mii Message-ID: <200811282344.mASNiDXB033178@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Fri Nov 28 23:44:13 2008 New Revision: 185421 URL: http://svn.freebsd.org/changeset/base/185421 Log: 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: head/sys/dev/mii/truephy.c Modified: head/sys/dev/mii/truephy.c ============================================================================== --- head/sys/dev/mii/truephy.c Fri Nov 28 23:39:25 2008 (r185420) +++ head/sys/dev/mii/truephy.c Fri Nov 28 23:44:13 2008 (r185421) @@ -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); @@ -298,7 +299,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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811282344.mASNiDXB033178>