diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2008-11-28 23:44:13 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2008-11-28 23:44:13 +0000 |
| commit | 1e7d7466b7cb6edeaf3747d77ab32e765e3c8b88 (patch) | |
| tree | cd6a4e1892b07ba52d984b62b93763c0c1924f22 /sys/dev/mii/truephy.c | |
| parent | 5c890d3c4f87203f516374e450d9631827416d52 (diff) | |
| download | src-1e7d7466b7cb6edeaf3747d77ab32e765e3c8b88.tar.gz src-1e7d7466b7cb6edeaf3747d77ab32e765e3c8b88.zip | |
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
Notes
Notes:
svn path=/head/; revision=185421
Diffstat (limited to 'sys/dev/mii/truephy.c')
| -rw-r--r-- | sys/dev/mii/truephy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/mii/truephy.c b/sys/dev/mii/truephy.c index f5de6c4f9c11..4eba9d98aaec 100644 --- a/sys/dev/mii/truephy.c +++ b/sys/dev/mii/truephy.c @@ -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); |