From owner-svn-soc-all@FreeBSD.ORG  Fri Sep  5 11:24:18 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 877C817B
 for <svn-soc-all@FreeBSD.org>; Fri,  5 Sep 2014 11:24:18 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7339E15A7
 for <svn-soc-all@FreeBSD.org>; Fri,  5 Sep 2014 11:24:18 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s85BOIJs080489
 for <svn-soc-all@FreeBSD.org>; Fri, 5 Sep 2014 11:24:18 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s85BOIdF080487
 for svn-soc-all@FreeBSD.org; Fri, 5 Sep 2014 11:24:18 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Fri, 5 Sep 2014 11:24:18 GMT
Message-Id: <201409051124.s85BOIdF080487@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r273686 - soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Sep 2014 11:24:18 -0000

Author: dpl
Date: Fri Sep  5 11:24:17 2014
New Revision: 273686
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=273686

Log:
  Function name

Modified:
  soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_pfil.c

Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_pfil.c
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_pfil.c	Fri Sep  5 11:18:09 2014	(r273685)
+++ soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/ip_fw_pfil.c	Fri Sep  5 11:24:17 2014	(r273686)
@@ -91,7 +91,7 @@
 typedef int (*funcptr)();
 funcptr compile_code(struct ip_fw_args *, struct ip_fw_chain *);
 /* Pointer to the actual compiled code */
-int (*compiledfuncptr)(struct ip_fw_args *, struct ip_fw_chain *) = 0;
+int (*ipfw_chk_jit)(struct ip_fw_args *, struct ip_fw_chain *) = 0;
 struct ip_fw_chain *chain = &V_layer3_chain;
 
 /* ipfw_vnet_ready controls when we are open for business */
@@ -133,18 +133,18 @@
 	int ret;
 
 	/* If we haven't, JIT-compile the actions to be executed per-rule */
-	if (compiledfuncptr == 0) {
+	if (ipfw_chk_jit == 0) {
 		IPFW_PF_RLOCK(chain);
 		if (! V_ipfw_vnet_ready) { /* shutting down, leave NOW. */
 			IPFW_PF_RUNLOCK(chain);
 			return (IP_FW_PASS);	/* accept */
 		}
-		compiledfuncptr = compile_code(args, chain);
-		ret = compiledfuncptr(args, chain);
+		ipfw_chk_jit = compile_code(args, chain);
+		ret = ipfw_chk_jit(args, chain);
 		IPFW_PF_RUNLOCK(chain);
 	} else {
 		IPFW_PF_RLOCK(chain);
-		ret = compiledfuncptr(args, chain);
+		ret = ipfw_chk_jit(args, chain);
 		IPFW_PF_RUNLOCK(chain);
 	}
 	return (ret);