From 6e891d64ed2eaa7b83139f823052add021a09015 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Thu, 1 Jun 2000 21:57:13 +0000 Subject: [PATCH] Don't panic if ifpromisc() returnes ENXIO, it's probably just an pccard which have been pulled. --- sys/net/bpf.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 6c08190cc1f..5fc8262c418 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -295,6 +295,7 @@ static void bpf_detachd(d) struct bpf_d *d; { + int error; struct bpf_d **p; struct bpf_if *bp; @@ -305,13 +306,17 @@ bpf_detachd(d) */ if (d->bd_promisc) { d->bd_promisc = 0; - if (ifpromisc(bp->bif_ifp, 0)) + error = ifpromisc(bp->bif_ifp, 0); + if (error != 0 && error != ENXIO) { /* + * ENXIO can happen if a pccard is unplugged * Something is really wrong if we were able to put * the driver into promiscuous mode, but can't * take it out. */ - panic("bpf: ifpromisc failed"); + printf("%s%d: ifpromisc failed %d\n", + bp->bif_ifp->if_name, bp->bif_ifp->if_unit, error); + } } /* Remove d from the interface's descriptor list. */ p = &bp->bif_dlist;