diff options
| author | wpaul <wpaul@FreeBSD.org> | 2005-11-13 21:36:48 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 2005-11-13 21:36:48 +0000 |
| commit | c3427572d7afd589e619448d1f28b53b9c89e348 (patch) | |
| tree | 89dee18bb2e711676e93dba084953a57fba2bb80 /sys | |
| parent | 6a5a7b72907b572a1303984c78ec91d10d86c3c1 (diff) | |
| download | FreeBSD-src-c3427572d7afd589e619448d1f28b53b9c89e348.zip FreeBSD-src-c3427572d7afd589e619448d1f28b53b9c89e348.tar.gz | |
Restore backwards source compatibility with 6.x and 5.x.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/compat/ndis/subr_ndis.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c index c151252..de50ce3 100644 --- a/sys/compat/ndis/subr_ndis.c +++ b/sys/compat/ndis/subr_ndis.c @@ -1407,14 +1407,18 @@ NdisReadNetworkAddress(status, addr, addrlen, adapter) block = (ndis_miniport_block *)adapter; sc = device_get_softc(block->nmb_physdeviceobj->do_devext); -#ifdef IF_LLADDR +#ifdef IFP2ENADDR + if (bcmp(IFP2ENADDR(sc->ifp), empty, ETHER_ADDR_LEN) == 0) +#elif __FreeBSD_version >= 700000 if (bcmp(IF_LLADDR(sc->ifp), empty, ETHER_ADDR_LEN) == 0) #else if (bcmp(sc->arpcom.ac_enaddr, empty, ETHER_ADDR_LEN) == 0) #endif *status = NDIS_STATUS_FAILURE; else { -#ifdef IF_LLADDR +#ifdef IFP2ENADDR + *addr = IFP2ENADDR(sc->ifp); +#elif __FreeBSD_version >= 700000 *addr = IF_LLADDR(sc->ifp); #else *addr = sc->arpcom.ac_enaddr; |
