d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed the FRAMELEN macro to TRUEPHY_FRAMELEN as for powerpc

Browse Source 
it seems to be possible to collide with FRAMELEN from machine/frame.h.

Found by:	zec
This commit is contained in:
Bjoern A. Zeeb 2008-11-28 23:44:13 +00:00
parent 5c890d3c4f
commit 1e7d7466b7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/mii/truephy.c
View File

@ -57,7 +57,8 @@
#include "miibus_if.h" #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_service(struct mii_softc *, struct mii_data *, int);
static int truephy_attach(device_t); static int truephy_attach(device_t);
@ -298,7 +299,7 @@ truephy_reset(struct mii_softc *sc)
mii_phy_reset(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; int conf;
conf = PHY_READ(sc, TRUEPHY_CONF); conf = PHY_READ(sc, TRUEPHY_CONF);