Module Name: src Committed By: christos Date: Thu Dec 5 15:55:35 UTC 2013
Modified Files: src/sys/net: bpf.c Log Message: It is silly to kill the system when an interface failed to clear promiscuous mode. Some return EINVAL when they are dying, but others like USB return EIO. Downgrade to a DIAGNOSTIC printf. Same should be done for the malloc/NOWAIT, but this is rarely hit. To generate a diff of this commit: cvs rdiff -u -r1.179 -r1.180 src/sys/net/bpf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/net/bpf.c diff -u src/sys/net/bpf.c:1.179 src/sys/net/bpf.c:1.180 --- src/sys/net/bpf.c:1.179 Fri Nov 15 20:13:52 2013 +++ src/sys/net/bpf.c Thu Dec 5 10:55:35 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: bpf.c,v 1.179 2013/11/16 01:13:52 rmind Exp $ */ +/* $NetBSD: bpf.c,v 1.180 2013/12/05 15:55:35 christos Exp $ */ /* * Copyright (c) 1990, 1991, 1993 @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.179 2013/11/16 01:13:52 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.180 2013/12/05 15:55:35 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_bpf.h" @@ -356,7 +356,7 @@ bpf_detachd(struct bpf_d *d) * If so, turn it off. */ if (d->bd_promisc) { - int error; + int error __diagused; d->bd_promisc = 0; /* @@ -367,8 +367,10 @@ bpf_detachd(struct bpf_d *d) * if we don't get an unexpected error. */ error = ifpromisc(bp->bif_ifp, 0); - if (error && error != EINVAL) - panic("%s: ifpromisc failed: %d", __func__, error); +#ifdef DIAGNOSTIC + if (error) + printf("%s: ifpromisc failed: %d", __func__, error); +#endif } /* Remove d from the interface's descriptor list. */ p = &bp->bif_dlist;