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/sn/if_sn.c | 5 +---- sys/dev/sn/if_sn_pccard.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'sys/dev/sn') diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c index 860d3ef..2794442 100644 --- a/sys/dev/sn/if_sn.c +++ b/sys/dev/sn/if_sn.c @@ -222,8 +222,7 @@ sn_attach(device_t dev) ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; ifp->if_timer = 0; - if_attach(ifp); - ether_ifattach(ifp); + ether_ifattach(ifp, ETHER_BPF_SUPPORTED); /* * Fill the hardware address into ifa_addr if we find an AF_LINK @@ -243,8 +242,6 @@ sn_attach(device_t dev) bcopy(sc->arpcom.ac_enaddr, LLADDR(sdl), ETHER_ADDR_LEN); } - bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header)); - return 0; } diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c index 018646e..4220dea 100644 --- a/sys/dev/sn/if_sn_pccard.c +++ b/sys/dev/sn/if_sn_pccard.c @@ -90,7 +90,7 @@ sn_pccard_detach(device_t dev) struct sn_softc *sc = device_get_softc(dev); sc->arpcom.ac_if.if_flags &= ~IFF_RUNNING; - if_detach(&sc->arpcom.ac_if); + ether_ifdetach(&sc->arpcom.ac_if, ETHER_BPF_SUPPORTED); sn_deactivate(dev); return 0; } -- cgit v1.1