if_ste.c (113609) | if_ste.c (113812) |
---|---|
1/* 2 * Copyright (c) 1997, 1998, 1999 3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 30 * THE POSSIBILITY OF SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> | 1/* 2 * Copyright (c) 1997, 1998, 1999 3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 17 unchanged lines hidden (view full) --- 26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 30 * THE POSSIBILITY OF SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> |
34__FBSDID("$FreeBSD: head/sys/pci/if_ste.c 113609 2003-04-17 20:32:06Z njl $"); | 34__FBSDID("$FreeBSD: head/sys/pci/if_ste.c 113812 2003-04-21 18:34:04Z imp $"); |
35 36#include <sys/param.h> 37#include <sys/systm.h> 38#include <sys/sockio.h> 39#include <sys/mbuf.h> 40#include <sys/malloc.h> 41#include <sys/kernel.h> 42#include <sys/socket.h> --- 1041 unchanged lines hidden (view full) --- 1084 struct ifnet *ifp; 1085 1086 sc = device_get_softc(dev); 1087 KASSERT(mtx_initialized(&sc->ste_mtx), ("ste mutex not initialized")); 1088 STE_LOCK(sc); 1089 ifp = &sc->arpcom.ac_if; 1090 1091 /* These should only be active if attach succeeded */ | 35 36#include <sys/param.h> 37#include <sys/systm.h> 38#include <sys/sockio.h> 39#include <sys/mbuf.h> 40#include <sys/malloc.h> 41#include <sys/kernel.h> 42#include <sys/socket.h> --- 1041 unchanged lines hidden (view full) --- 1084 struct ifnet *ifp; 1085 1086 sc = device_get_softc(dev); 1087 KASSERT(mtx_initialized(&sc->ste_mtx), ("ste mutex not initialized")); 1088 STE_LOCK(sc); 1089 ifp = &sc->arpcom.ac_if; 1090 1091 /* These should only be active if attach succeeded */ |
1092 if (device_is_alive(dev)) { | 1092 if (device_is_attached(dev)) { |
1093 ste_stop(sc); 1094 ether_ifdetach(ifp); 1095 } 1096 if (sc->ste_miibus) 1097 device_delete_child(dev, sc->ste_miibus); 1098 bus_generic_detach(dev); 1099 1100 if (sc->ste_intrhand) --- 550 unchanged lines hidden --- | 1093 ste_stop(sc); 1094 ether_ifdetach(ifp); 1095 } 1096 if (sc->ste_miibus) 1097 device_delete_child(dev, sc->ste_miibus); 1098 bus_generic_detach(dev); 1099 1100 if (sc->ste_intrhand) --- 550 unchanged lines hidden --- |