summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/dc/if_dc.c2
-rw-r--r--sys/dev/sf/if_sf.c2
-rw-r--r--sys/dev/sk/if_sk.c2
-rw-r--r--sys/dev/ti/if_ti.c2
-rw-r--r--sys/dev/vr/if_vr.c2
-rw-r--r--sys/pci/if_dc.c2
-rw-r--r--sys/pci/if_pcn.c2
-rw-r--r--sys/pci/if_rl.c2
-rw-r--r--sys/pci/if_sf.c2
-rw-r--r--sys/pci/if_sis.c2
-rw-r--r--sys/pci/if_sk.c2
-rw-r--r--sys/pci/if_ste.c2
-rw-r--r--sys/pci/if_ti.c2
-rw-r--r--sys/pci/if_tl.c2
-rw-r--r--sys/pci/if_vr.c2
-rw-r--r--sys/pci/if_wb.c2
-rw-r--r--sys/pci/if_xl.c2
17 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 1f872ec..a350d47 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -2316,7 +2316,7 @@ dc_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
dc_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 511e450..af40295 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -829,7 +829,7 @@ sf_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
sf_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 49424bb..7e4e423 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -1375,7 +1375,7 @@ sk_detach_xmac(dev)
ifp = &sc_if->arpcom.ac_if;
/* These should only be active if attach_xmac succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
sk_stop(sc_if);
ether_ifdetach(ifp);
}
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 5046685..614a408 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -2377,7 +2377,7 @@ ti_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
ti_stop(sc);
ether_ifdetach(ifp);
bus_generic_detach(dev);
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 84bd474..2c6e933 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -915,7 +915,7 @@ vr_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
vr_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 1f872ec..a350d47 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -2316,7 +2316,7 @@ dc_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
dc_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index 00fe08b..781924d 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -665,7 +665,7 @@ pcn_detach(dev)
PCN_LOCK(sc);
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
pcn_reset(sc);
pcn_stop(sc);
ether_ifdetach(ifp);
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 5ddff77..935ad1b 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -1101,7 +1101,7 @@ rl_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
rl_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 511e450..af40295 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -829,7 +829,7 @@ sf_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
sf_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index e8bf48f..bb502f4 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -1424,7 +1424,7 @@ sis_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
sis_reset(sc);
sis_stop(sc);
ether_ifdetach(ifp);
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 49424bb..7e4e423 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -1375,7 +1375,7 @@ sk_detach_xmac(dev)
ifp = &sc_if->arpcom.ac_if;
/* These should only be active if attach_xmac succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
sk_stop(sc_if);
ether_ifdetach(ifp);
}
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 3c913a0..1377c45 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -1089,7 +1089,7 @@ ste_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
ste_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 5046685..614a408 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -2377,7 +2377,7 @@ ti_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
ti_stop(sc);
ether_ifdetach(ifp);
bus_generic_detach(dev);
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index ebe64cc..4fb66ee 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -1349,7 +1349,7 @@ tl_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
tl_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 84bd474..2c6e933 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -915,7 +915,7 @@ vr_detach(dev)
ifp = &sc->arpcom.ac_if;
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
vr_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index b0ef638..45e6d62 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -981,7 +981,7 @@ wb_detach(dev)
* Delete any miibus and phy devices attached to this interface.
* This should only be done if attach succeeded.
*/
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
wb_stop(sc);
ether_ifdetach(ifp);
}
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 8e6756f..25f9330 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -1769,7 +1769,7 @@ xl_detach(dev)
}
/* These should only be active if attach succeeded */
- if (device_is_alive(dev)) {
+ if (device_is_attached(dev)) {
xl_reset(sc);
xl_stop(sc);
ether_ifdetach(ifp);
OpenPOWER on IntegriCloud