socsvn commit: r273686 - soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw

[dpl at FreeBSD.org]

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);