diff options
| author | dmlb <dmlb@FreeBSD.org> | 2001-01-02 20:29:25 +0000 |
|---|---|---|
| committer | dmlb <dmlb@FreeBSD.org> | 2001-01-02 20:29:25 +0000 |
| commit | c0bd1292218f26528657aa0ac9393c87bf68c3de (patch) | |
| tree | f7376d301a1c1aa18d763f7a284d8c078c01a66d /sys/dev/ray | |
| parent | dd03284643e3ffd6949a49723f79b49d337e77f6 (diff) | |
| download | FreeBSD-src-c0bd1292218f26528657aa0ac9393c87bf68c3de.zip FreeBSD-src-c0bd1292218f26528657aa0ac9393c87bf68c3de.tar.gz | |
Tidy up if_init routine so that it does not return an error.
Diffstat (limited to 'sys/dev/ray')
| -rw-r--r-- | sys/dev/ray/if_ray.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c index 2e34b3c..e81cd43 100644 --- a/sys/dev/ray/if_ray.c +++ b/sys/dev/ray/if_ray.c @@ -288,6 +288,7 @@ static void ray_com_runq (struct ray_softc *sc); static int ray_com_runq_add (struct ray_softc *sc, struct ray_comq_entry *com[], int ncom, char *wmesg); static void ray_com_runq_done (struct ray_softc *sc); static int ray_detach (device_t); +static void ray_init (void *xsc); static int ray_init_user (struct ray_softc *sc); static void ray_init_assoc (struct ray_softc *sc, struct ray_comq_entry *com); static void ray_init_assoc_done (struct ray_softc *sc, size_t ccs); @@ -505,7 +506,7 @@ ray_attach(device_t dev) ifp->if_start = ray_tx; ifp->if_ioctl = ray_ioctl; ifp->if_watchdog = ray_watchdog; - ifp->if_init = ray_init_user; + ifp->if_init = ray_init; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; ether_ifattach(ifp, ETHER_BPF_SUPPORTED); @@ -736,6 +737,17 @@ ray_ioctl(register struct ifnet *ifp, u_long command, caddr_t data) } /* + * Ethernet layer entry to ray_init - discard errors + */ +static void +ray_init(void *xsc) +{ + struct ray_softc *sc = (struct ray_softc *)xsc; + + ray_init_user(sc); +} + +/* * User land entry to network initialisation and changes in interface flags. * * We do a very little work here, just creating runq entries to |
