Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add shutdown hook to turn off card. 

Fix BPF tap code.
This commit is contained in:
sommerfeld 1999-07-14 23:07:29 +00:00
parent 76b2d00f39
commit 48f2389776
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/dev/pcmcia/if_wi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wi.c,v 1.1 1999/07/14 22:24:08 sommerfeld Exp $ */ /* $NetBSD: if_wi.c,v 1.2 1999/07/14 23:07:29 sommerfeld Exp $ */
/* /*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
@ -31,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: if_wi.c,v 1.1 1999/07/14 22:24:08 sommerfeld Exp $ * $Id: if_wi.c,v 1.2 1999/07/14 23:07:29 sommerfeld Exp $
*/ */
/* /*
@ -98,7 +98,7 @@
#include <netinet/if_inarp.h> #include <netinet/if_inarp.h>
#endif #endif
#if NBPF > 0 #if NBPFILTER > 0
#include <net/bpf.h> #include <net/bpf.h>
#include <net/bpfdesc.h> #include <net/bpfdesc.h>
#endif #endif
@ -115,7 +115,7 @@
#if !defined(lint) #if !defined(lint)
static const char rcsid[] = static const char rcsid[] =
"$Id: if_wi.c,v 1.1 1999/07/14 22:24:08 sommerfeld Exp $"; "$Id: if_wi.c,v 1.2 1999/07/14 23:07:29 sommerfeld Exp $";
#endif #endif
#ifdef foo #ifdef foo
@ -151,6 +151,7 @@ static int wi_alloc_nicmem __P((struct wi_softc *, int, int *));
static void wi_inquire __P((void *)); static void wi_inquire __P((void *));
static void wi_setdef __P((struct wi_softc *, struct wi_req *)); static void wi_setdef __P((struct wi_softc *, struct wi_req *));
static int wi_mgmt_xmit __P((struct wi_softc *, caddr_t, int)); static int wi_mgmt_xmit __P((struct wi_softc *, caddr_t, int));
static void wi_shutdown __P((void *));
static int wi_enable __P((struct wi_softc *)); static int wi_enable __P((struct wi_softc *));
static int wi_disable __P((struct wi_softc *)); static int wi_disable __P((struct wi_softc *));
@ -322,15 +323,12 @@ wi_attach(parent, self, aux)
if_attach(ifp); if_attach(ifp);
ether_ifattach(ifp, mac.wi_mac_addr); ether_ifattach(ifp, mac.wi_mac_addr);
#if NBPF > 0 #if NBPFILTER > 0
bpfattach(&sc->sc_ethercom.ec_if.if_bpf, ifp, DLT_EN10MB, bpfattach(&sc->sc_ethercom.ec_if.if_bpf, ifp, DLT_EN10MB,
sizeof(struct ether_header)); sizeof(struct ether_header));
#endif #endif
#if 0 sc->sc_sdhook = shutdownhook_establish(wi_shutdown, sc);
/* XXX should use NetBSD shutdown hooks here */
at_shutdown(wi_shutdown, sc, SHUTDOWN_POST_SYNC);
#endif
} }
static void wi_rxeof(sc) static void wi_rxeof(sc)
@ -425,12 +423,12 @@ static void wi_rxeof(sc)
ifp->if_ipackets++; ifp->if_ipackets++;
#if NBPF > 0 #if NBPFILTER > 0
/* Handle BPF listeners. */ /* Handle BPF listeners. */
if (ifp->if_bpf) { if (ifp->if_bpf) {
bpf_mtap(ifp, m); bpf_mtap(ifp->if_bpf, m);
if (ifp->if_flags & IFF_PROMISC && if (ifp->if_flags & IFF_PROMISC &&
(bcmp(eh->ether_dhost, sc->sc_ethercom.ec_enaddr, (bcmp(eh->ether_dhost, sc->sc_macaddr,
ETHER_ADDR_LEN) && (eh->ether_dhost[0] & 1) == 0)) { ETHER_ADDR_LEN) && (eh->ether_dhost[0] & 1) == 0)) {
m_freem(m); m_freem(m);
return; return;
@ -1233,13 +1231,13 @@ static void wi_start(ifp)
m0->m_pkthdr.len + 2); m0->m_pkthdr.len + 2);
} }
#if NBPF > 0 #if NBPFILTER > 0
/* /*
* If there's a BPF listner, bounce a copy of * If there's a BPF listner, bounce a copy of
* this frame to him. * this frame to him.
*/ */
if (ifp->if_bpf) if (ifp->if_bpf)
bpf_mtap(ifp, m0); bpf_mtap(ifp->if_bpf, m0);
#endif #endif
m_freem(m0); m_freem(m0);
@ -1330,16 +1328,12 @@ static void wi_watchdog(ifp)
return; return;
} }
#if 0 static void wi_shutdown(arg)
static void wi_shutdown(howto, arg)
int howto;
void *arg; void *arg;
{ {
struct wi_softc *sc; struct wi_softc *sc;
sc = arg; sc = arg;
wi_stop(sc); wi_disable(sc);
return; return;
} }
#endif

5
sys/dev/pcmcia/if_wivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wivar.h,v 1.1 1999/07/14 22:24:11 sommerfeld Exp $ */ /* $NetBSD: if_wivar.h,v 1.2 1999/07/14 23:07:29 sommerfeld Exp $ */
/* /*
* Copyright (c) 1997, 1998, 1999 * Copyright (c) 1997, 1998, 1999
@ -31,7 +31,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE. * THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: if_wivar.h,v 1.1 1999/07/14 22:24:11 sommerfeld Exp $ * $Id: if_wivar.h,v 1.2 1999/07/14 23:07:29 sommerfeld Exp $
*/ */
@ -75,6 +75,7 @@ struct wi_softc {
bus_space_tag_t wi_btag; bus_space_tag_t wi_btag;
bus_space_handle_t wi_bhandle; bus_space_handle_t wi_bhandle;
void *sc_sdhook; /* saved shutdown hook for card */
void *sc_ih; void *sc_ih;
u_int8_t sc_macaddr[6]; u_int8_t sc_macaddr[6];