From owner-svn-src-head@freebsd.org  Tue Nov  3 22:23:10 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EE9CA24FF1;
 Tue,  3 Nov 2015 22:23:10 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3BFD81CC5;
 Tue,  3 Nov 2015 22:23:10 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA3MN9Ou002061;
 Tue, 3 Nov 2015 22:23:09 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA3MN97n002060;
 Tue, 3 Nov 2015 22:23:09 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201511032223.tA3MN97n002060@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 3 Nov 2015 22:23:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290345 - head/sys/netpfil/ipfw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Nov 2015 22:23:10 -0000

Author: ae
Date: Tue Nov  3 22:23:09 2015
New Revision: 290345
URL: https://svnweb.freebsd.org/changeset/base/290345

Log:
  Remove now obsolete KASSERT.
  Actually, object classify callbacks can skip some opcodes, that could
  be rewritten. We will deteremine real numbed of rewritten opcodes a bit
  later in this function.
  
  Reported by:	David H. Wolfskill <david at catwhisker dot org>

Modified:
  head/sys/netpfil/ipfw/ip_fw_table.c

Modified: head/sys/netpfil/ipfw/ip_fw_table.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_table.c	Tue Nov  3 22:06:24 2015	(r290344)
+++ head/sys/netpfil/ipfw/ip_fw_table.c	Tue Nov  3 22:23:09 2015	(r290345)
@@ -3388,14 +3388,8 @@ ref_rule_objects(struct ip_fw_chain *ch,
 		IPFW_UH_WUNLOCK(ch);
 		return (error);
 	}
-
 	IPFW_UH_WUNLOCK(ch);
 
-	found = pidx - oib;
-	KASSERT(found == ci->object_opcodes,
-	    ("refcount inconsistency: found: %d total: %d",
-	    found, ci->object_opcodes));
-
 	/* Perform auto-creation for non-existing objects */
 	if (numnew != 0)
 		error = create_objects_compat(ch, rule->cmd, oib, pidx, ti);