Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pcmcia Check if device is active in wi_intr and wi_i...



details:   https://anonhg.NetBSD.org/src/rev/ce40d0bfe19c
branches:  trunk
changeset: 482062:ce40d0bfe19c
user:      enami <enami%NetBSD.org@localhost>
date:      Sat Feb 12 23:35:28 2000 +0000

description:
Check if device is active in wi_intr and wi_inquire.

diffstat:

 sys/dev/pcmcia/if_wi.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r b7d4c34b8949 -r ce40d0bfe19c sys/dev/pcmcia/if_wi.c
--- a/sys/dev/pcmcia/if_wi.c    Sat Feb 12 22:40:12 2000 +0000
+++ b/sys/dev/pcmcia/if_wi.c    Sat Feb 12 23:35:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wi.c,v 1.5 2000/02/12 16:08:04 itojun Exp $ */
+/*     $NetBSD: if_wi.c,v 1.6 2000/02/12 23:35:28 enami Exp $  */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *     $Id: if_wi.c,v 1.5 2000/02/12 16:08:04 itojun Exp $
+ *     $Id: if_wi.c,v 1.6 2000/02/12 23:35:28 enami Exp $
  */
 
 /*
@@ -115,7 +115,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-       "$Id: if_wi.c,v 1.5 2000/02/12 16:08:04 itojun Exp $";
+       "$Id: if_wi.c,v 1.6 2000/02/12 23:35:28 enami Exp $";
 #endif
 
 #ifdef foo
@@ -483,6 +483,9 @@
        sc = xsc;
        ifp = &sc->sc_ethercom.ec_if;
 
+       if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0)
+               return;
+
        timeout(wi_inquire, sc, hz * 60);
 
        /* Don't do this while we're transmitting */
@@ -539,6 +542,8 @@
        struct ifnet            *ifp;
        u_int16_t               status;
 
+       if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0)
+               return (0);
 
        ifp = &sc->sc_ethercom.ec_if;
 



Home | Main Index | Thread Index | Old Index