From 7357df6b4854f9914c605ad7c7cf3c01ea7700fd Mon Sep 17 00:00:00 2001 From: archie Date: Thu, 13 Jul 2000 22:54:34 +0000 Subject: Make all Ethernet drivers attach using ether_ifattach() and detach using ether_ifdetach(). The former consolidates the operations of if_attach(), ng_ether_attach(), and bpfattach(). The latter consolidates the corresponding detach operations. Reviewed by: julian, freebsd-net --- sys/dev/wi/if_wi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'sys/dev/wi/if_wi.c') diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c index deb797c..df6fb2a 100644 --- a/sys/dev/wi/if_wi.c +++ b/sys/dev/wi/if_wi.c @@ -216,8 +216,7 @@ static int wi_pccard_detach(dev) wi_stop(sc); - bpfdetach(ifp); - if_detach(ifp); + ether_ifdetach(ifp, ETHER_BPF_SUPPORTED); bus_teardown_intr(dev, sc->irq, sc->wi_intrhand); wi_free(dev); sc->wi_gone = 1; @@ -327,12 +326,10 @@ static int wi_pccard_attach(device_t dev) wi_stop(sc); /* - * Call MI attach routines. + * Call MI attach routine. */ - if_attach(ifp); - ether_ifattach(ifp); + ether_ifattach(ifp, ETHER_BPF_SUPPORTED); callout_handle_init(&sc->wi_stat_ch); - bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header)); return(0); } -- cgit v1.1