summaryrefslogtreecommitdiff
path: root/sys/dev/cardbus
diff options
context:
space:
mode:
authorDimitry Andric <dim@cvs.openbsd.org>2006-09-18 21:33:33 +0000
committerDimitry Andric <dim@cvs.openbsd.org>2006-09-18 21:33:33 +0000
commit4458493a8254e497ee8d753fe86ed8d3d0ba20e9 (patch)
tree2f69c4c2d8548a07b39ed5e54ae2975a30738d9d /sys/dev/cardbus
parentda60693861d2597a49ad622406e287847e083369 (diff)
Fix for re_stop() being called from re_cardbus_shutdown() with the
wrong arguments, causing uvm_fault on halt/reboot, with a cardbus re inserted. While here, cleanup prototypes and use revar.h everywhere. ok brad@
Diffstat (limited to 'sys/dev/cardbus')
-rw-r--r--sys/dev/cardbus/if_re_cardbus.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c
index 32075884e51..fcdf87cb1a5 100644
--- a/sys/dev/cardbus/if_re_cardbus.c
+++ b/sys/dev/cardbus/if_re_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_re_cardbus.c,v 1.7 2006/07/01 21:48:08 brad Exp $ */
+/* $OpenBSD: if_re_cardbus.c,v 1.8 2006/09/18 21:33:32 dim Exp $ */
/*
* Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org>
@@ -277,8 +277,9 @@ void
re_cardbus_shutdown(void *arg)
{
struct rl_softc *sc = (struct rl_softc *)arg;
+ struct ifnet *ifp = &sc->sc_arpcom.ac_if;
- re_stop(sc);
+ re_stop(ifp, 1);
}
void