Module Name: src
Committed By: rmind
Date: Thu Jul 25 01:00:28 UTC 2019
Modified Files:
src/sys/net/npf: npf_portmap.c
Log Message:
npf_portmap_flush: remove invalid assert (this routine can be callied via
the npf_destroy() path where the constraint is not applicable).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/npf_portmap.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/npf/npf_portmap.c
diff -u src/sys/net/npf/npf_portmap.c:1.2 src/sys/net/npf/npf_portmap.c:1.3
--- src/sys/net/npf/npf_portmap.c:1.2 Tue Jul 23 08:25:52 2019
+++ src/sys/net/npf/npf_portmap.c Thu Jul 25 01:00:28 2019
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_portmap.c,v 1.2 2019/07/23 08:25:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_portmap.c,v 1.3 2019/07/25 01:00:28 rmind Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -461,8 +461,6 @@ npf_portmap_flush(npf_t *npf)
npf_portmap_t *pm = npf->portmap;
bitmap_t *bm;
- KASSERT(npf_config_locked_p(npf));
-
while ((bm = LIST_FIRST(&pm->bitmap_list)) != NULL) {
for (unsigned i = 0; i < PORTMAP_L0_WORDS; i++) {
uintptr_t bm1 = bm->bits0[i];