diff options
| author | scottl <scottl@FreeBSD.org> | 2005-10-04 04:49:21 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2005-10-04 04:49:21 +0000 |
| commit | e3843610ee40a003342b7024d661837ba52cc19d (patch) | |
| tree | 88656269cffc9327f9142b6cb40fa27dffcbc00c /sys | |
| parent | 18dd39f419d07d5a1622a56da480985c41f78d0e (diff) | |
| download | FreeBSD-src-e3843610ee40a003342b7024d661837ba52cc19d.zip FreeBSD-src-e3843610ee40a003342b7024d661837ba52cc19d.tar.gz | |
For some utterly bizarre reason, sparc64 coerces PAGE_SIZE to be a long
instead of an int. No other FreeBSD architecture does this. Patch over
this problem in the lmc driver. While I'm here, correct a mistake with
DEVICE_POLLING.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/lmc/if_lmc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c index d475bab..6a50e8a 100644 --- a/sys/dev/lmc/if_lmc.c +++ b/sys/dev/lmc/if_lmc.c @@ -2600,7 +2600,8 @@ create_ring(softc_t *sc, struct desc_ring *ring, int num_descs) /* The DMA descriptor array must not cross a page boundary. */ if (size_descs > PAGE_SIZE) { - printf("%s: DMA descriptor array > PAGE_SIZE (%d)\n", NAME_UNIT, PAGE_SIZE); + printf("%s: DMA descriptor array > PAGE_SIZE (%d)\n", NAME_UNIT, + (u_int)PAGE_SIZE); return EINVAL; } @@ -3952,7 +3953,7 @@ fbsd_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { softc_t *sc = IFP2SC(ifp); -#if (__FreeBSD_version < 500000) +#if (__FreeBSD_version < 700000) if ((ifp->if_capenable & IFCAP_POLLING) == 0) { ether_poll_deregister(ifp); |
