Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

It is silly to kill the system when an interface failed to clear promiscuous

Browse Source 
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.
This commit is contained in:
christos 2013-12-05 15:55:35 +00:00
parent 50ef47947d
commit c16aecd187
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/bpf.c
View File

@ -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 * Copyright (c) 1990, 1991, 1993
@ -39,7 +39,7 @@
*/ */
#include <sys/cdefs.h> #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) #if defined(_KERNEL_OPT)
#include "opt_bpf.h" #include "opt_bpf.h"
@ -356,7 +356,7 @@ bpf_detachd(struct bpf_d *d)
* If so, turn it off. * If so, turn it off.
*/ */
if (d->bd_promisc) { if (d->bd_promisc) {
int error; int error __diagused;
d->bd_promisc = 0; d->bd_promisc = 0;
/* /*
@ -367,8 +367,10 @@ bpf_detachd(struct bpf_d *d)
* if we don't get an unexpected error. * if we don't get an unexpected error.
*/ */
error = ifpromisc(bp->bif_ifp, 0); error = ifpromisc(bp->bif_ifp, 0);
if (error && error != EINVAL) #ifdef DIAGNOSTIC
panic("%s: ifpromisc failed: %d", __func__, error); if (error)
printf("%s: ifpromisc failed: %d", __func__, error);
#endif
} }
/* Remove d from the interface's descriptor list. */ /* Remove d from the interface's descriptor list. */
p = &bp->bif_dlist; p = &bp->bif_dlist;