From 78730e0ffaed08b3146d58ecdcb0d8adbc095be2 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Tue, 10 Oct 2006 11:34:55 +0000 Subject: [PATCH] Set 'error' if we can't get Mac address from Xircom cards, so that caller of attach() will know that attaching failed. This avoids panic on double detach(). Paniced-by: 'Koston' on #EFnet Reminded-by: swildner@ --- sys/dev/netif/dc/if_dc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c index 16eb419c6d..4d463aec30 100644 --- a/sys/dev/netif/dc/if_dc.c +++ b/sys/dev/netif/dc/if_dc.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ - * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.51 2006/09/05 00:55:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.52 2006/10/10 11:34:55 sephe Exp $ */ /* @@ -2070,6 +2070,7 @@ dc_attach(device_t dev) mac = pci_get_ether(dev); if (!mac) { device_printf(dev, "No station address in CIS!\n"); + error = ENXIO; goto fail; } bcopy(mac, eaddr, ETHER_ADDR_LEN); -- 2.41.0