diff options
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/atw.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/atwvar.h | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c index 7c56561347b..29f4b94aa7b 100644 --- a/sys/dev/ic/atw.c +++ b/sys/dev/ic/atw.c @@ -1,5 +1,5 @@ -/* $OpenBSD: atw.c,v 1.16 2004/07/15 15:28:59 millert Exp $ */ -/* $NetBSD: atw.c,v 1.59 2004/07/15 07:19:46 dyoung Exp $ */ +/* $OpenBSD: atw.c,v 1.17 2004/07/15 15:39:40 millert Exp $ */ +/* $NetBSD: atw.c,v 1.60 2004/07/15 07:20:46 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ #include <sys/cdefs.h> #if defined(__NetBSD__) -__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.59 2004/07/15 07:19:46 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.60 2004/07/15 07:20:46 dyoung Exp $"); #endif #include "bpfilter.h" @@ -1187,8 +1187,6 @@ atw_init(struct ifnet *ifp) ATW_WRITE(sc, ATW_IER, sc->sc_inten); ATW_WRITE(sc, ATW_STSR, 0xffffffff); - if (sc->sc_intr_ack != NULL) - (*sc->sc_intr_ack)(sc); DPRINTF(sc, ("%s: ATW_IER %08x, inten %08x\n", sc->sc_dev.dv_xname, ATW_READ(sc, ATW_IER), sc->sc_inten)); diff --git a/sys/dev/ic/atwvar.h b/sys/dev/ic/atwvar.h index 4f8d6ea21f6..60baaccef1f 100644 --- a/sys/dev/ic/atwvar.h +++ b/sys/dev/ic/atwvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atwvar.h,v 1.3 2004/07/15 12:00:31 millert Exp $ */ +/* $OpenBSD: atwvar.h,v 1.4 2004/07/15 15:39:41 millert Exp $ */ /* $NetBSD: atwvar.h,v 1.10 2004/07/15 06:06:53 dyoung Exp $ */ /* @@ -254,9 +254,6 @@ struct atw_softc { u_int32_t sc_txint_mask; /* mask of Tx interrupts we want */ u_int32_t sc_linkint_mask;/* link-state interrupts mask */ - /* interrupt acknowledge hook */ - void (*sc_intr_ack)(struct atw_softc *); - enum atw_rftype sc_rftype; enum atw_bbptype sc_bbptype; u_int32_t sc_synctl_rd; |