summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-10-21 16:04:13 -0200
committerRenato Botelho <renato@netgate.com>2015-10-21 16:04:13 -0200
commit6dfdfbb12b356dae762c3bce132809457ed60d97 (patch)
tree4e87edfd6f7353e79d923ab457270e9351daec3d /sys/contrib
parent13010d6b0da4d97e56243edbea0a585b8285cd3e (diff)
parentd621159ed6a7d1c98cf81f17e313dffc64bf7c4f (diff)
downloadFreeBSD-src-6dfdfbb12b356dae762c3bce132809457ed60d97.zip
FreeBSD-src-6dfdfbb12b356dae762c3bce132809457ed60d97.tar.gz
Merge branch 'stable/10' into devel
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_state.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index a3930ea..2ceec32 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -3650,7 +3650,6 @@ ipf_state_del(softc, is, why)
if (is->is_ref > 0) {
int refs;
- is->is_ref--;
refs = is->is_ref;
MUTEX_EXIT(&is->is_lock);
if (!orphan)
@@ -3667,7 +3666,7 @@ ipf_state_del(softc, is, why)
}
}
- is->is_ref = 0;
+ ASSERT(is->is_ref == 0);
MUTEX_EXIT(&is->is_lock);
if (is->is_tqehead[0] != NULL) {
OpenPOWER on IntegriCloud