diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2002-11-11 02:32:33 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2002-11-11 02:32:33 +0000 |
| commit | bfc8513ad060ae172ee8a491fc1dfe5e8578b64f (patch) | |
| tree | b3f0d84391d5e44adb90e588ab1a18b3b941d6d8 /sys/dev/usb/if_url.c | |
| parent | 5a8ae48cfc551cf56b4e583bdec0942f884088c8 (diff) | |
sync with NetBSD
Diffstat (limited to 'sys/dev/usb/if_url.c')
| -rw-r--r-- | sys/dev/usb/if_url.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index a3a888c4048..b3d1ffcb782 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,5 +1,5 @@ -/* $OpenBSD: if_url.c,v 1.8 2002/09/29 22:49:10 jason Exp $ */ -/* $NetBSD: if_url.c,v 1.2 2002/03/28 21:49:19 ichiro Exp $ */ +/* $OpenBSD: if_url.c,v 1.9 2002/11/11 02:32:32 nate Exp $ */ +/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 * Shingo WATANABE <nabe@nabechan.org>. All rights reserved. @@ -292,6 +292,10 @@ USB_ATTACH(url) ifp->if_start = url_start; ifp->if_ioctl = url_ioctl; ifp->if_watchdog = url_watchdog; +#if defined(__NetBSD__) + ifp->if_init = url_init; + ifp->if_stop = url_stop; +#endif IFQ_SET_READY(&ifp->if_snd); @@ -540,7 +544,7 @@ url_init(struct ifnet *ifp) eaddr = sc->sc_ac.ac_enaddr; #elif defined(__NetBSD__) eaddr = LLADDR(ifp->if_sadl); -#endif /* defined(__NetBSD__) */ +#endif for (i = 0; i < ETHER_ADDR_LEN; i++) url_csr_write_1(sc, URL_IDR0 + i, eaddr[i]); @@ -638,7 +642,7 @@ url_activate(device_ptr_t self, enum devact act) break; case DVACT_DEACTIVATE: - if_deactivate(&sc->sc_ac.ec_if); + if_deactivate(GET_IFP(sc)); sc->sc_dying = 1; break; } |